30 files changed, 95192 insertions, 32077 deletions

diff --git a/m4/Makefile.in b/m4/Makefile.in
index b4abac685..de92c33f1 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -85,12 +85,16 @@ GPGKEYS_LDAP = @GPGKEYS_LDAP@
 GPGKEYS_LDAP_FALSE = @GPGKEYS_LDAP_FALSE@
 GPGKEYS_LDAP_TRUE = @GPGKEYS_LDAP_TRUE@
 GPGKEYS_MAILTO = @GPGKEYS_MAILTO@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_DOCBOOK_TO_MAN_FALSE = @HAVE_DOCBOOK_TO_MAN_FALSE@
 HAVE_DOCBOOK_TO_MAN_TRUE = @HAVE_DOCBOOK_TO_MAN_TRUE@
 HAVE_DOCBOOK_TO_TEXI_FALSE = @HAVE_DOCBOOK_TO_TEXI_FALSE@
 HAVE_DOCBOOK_TO_TEXI_TRUE = @HAVE_DOCBOOK_TO_TEXI_TRUE@
 HAVE_DOSISH_SYSTEM_FALSE = @HAVE_DOSISH_SYSTEM_FALSE@
 HAVE_DOSISH_SYSTEM_TRUE = @HAVE_DOSISH_SYSTEM_TRUE@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
 IDEA_O = @IDEA_O@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -190,7 +194,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
+EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
 subdir = m4
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/po/be.po b/po/be.po
new file mode 100644
index 000000000..2a3d81084
--- /dev/null
+++ b/po/be.po
@@ -0,0 +1,5099 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# Ales Nyakhaychyk <[email protected]>, 2003.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-10-30 16:35+0200\n"
+"Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
+"Language-Team: Belarusian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#: util/secmem.c:90
+msgid "WARNING: using insecure memory!\n"
+msgstr "УВАГА! Выкарыстоўваецца небясьпечная памяць!\n"
+
+#: util/secmem.c:91
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr ""
+"па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
+
+#: util/secmem.c:340
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "дзеяньне немагчымае без распачатае бясьпечнае памяці\n"
+
+#: util/secmem.c:341
+msgid "(you may have used the wrong program for this task)\n"
+msgstr ""
+
+#: util/miscutil.c:307 util/miscutil.c:344
+#, fuzzy
+msgid "yes"
+msgstr "yes [так]"
+
+#: util/miscutil.c:308 util/miscutil.c:349
+msgid "yY"
+msgstr "yY"
+
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "no [не]"
+
+#: util/miscutil.c:311 util/miscutil.c:350
+msgid "nN"
+msgstr "nN"
+
+#: util/miscutil.c:348 g10/keyedit.c:1138
+msgid "quit"
+msgstr "quit [выйсьці]"
+
+#: util/miscutil.c:351
+msgid "qQ"
+msgstr "qQ"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+msgid "cC"
+msgstr ""
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "агульная памылка"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr ""
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "невядомая вэрсыя"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr ""
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr ""
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "дрэнны грамадскі ключ"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "дрэнны сакрэтны ключ"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr ""
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "памылка праверчае сумы"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "дрэнны пароль"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr ""
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "немагчыма адчыніць зьвязак ключоў"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr ""
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr ""
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "карыстальнік з такім ID адсутнічае"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "сакрэтны ключ недаступны"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr ""
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "непадтрымліваецца"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "дрэнны ключ"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "памылка чытаньня файла"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "памылка запісу файла"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "невядомы альгарытм сьцісканьня"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "памылка адчыненьня файла"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "памылка стварэньня файла"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "нерэчаісны пароль"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr ""
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr ""
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr ""
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr ""
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "дрэнны MPI"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr ""
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr ""
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "дрэнны сэртыфікат"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr ""
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "памылка зачыненьня файла"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "памылка перайменаваньня файла"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "памылка выдаленьня файла"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "нечаканыя даньні"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr ""
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr ""
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr ""
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr ""
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr ""
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr ""
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr ""
+
+#: util/errors.c:100
+msgid "network error"
+msgstr ""
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr ""
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr ""
+
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr ""
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr ""
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr ""
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr ""
+
+#: util/logger.c:285
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr ""
+
+#: cipher/random.c:163
+msgid "no entropy gathering module detected\n"
+msgstr ""
+
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr ""
+
+#: cipher/random.c:391
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr ""
+
+#: cipher/random.c:396
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr ""
+
+#: cipher/random.c:401
+msgid "note: random_seed file is empty\n"
+msgstr ""
+
+#: cipher/random.c:407
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr ""
+
+#: cipher/random.c:415
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr ""
+
+#: cipher/random.c:453
+msgid "note: random_seed file not updated\n"
+msgstr ""
+
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr ""
+
+#: cipher/random.c:480
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr ""
+
+#: cipher/random.c:483
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr ""
+
+#: cipher/random.c:728
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr ""
+
+#: cipher/random.c:729
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+
+#: cipher/primegen.c:120
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr ""
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:354
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Загады:\n"
+" "
+
+#: g10/g10.c:356
+msgid "|[file]|make a signature"
+msgstr "|[файл]|зрабіць подпіс"
+
+#: g10/g10.c:357
+msgid "|[file]|make a clear text signature"
+msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
+
+#: g10/g10.c:358
+msgid "make a detached signature"
+msgstr "зрабіць адчэплены подпіс"
+
+#: g10/g10.c:359
+msgid "encrypt data"
+msgstr "зашыфраваць даньні"
+
+#: g10/g10.c:361
+msgid "encryption only with symmetric cipher"
+msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
+
+#: g10/g10.c:363
+msgid "decrypt data (default)"
+msgstr "разшыфраваць даньні (дапомна)"
+
+#: g10/g10.c:365
+msgid "verify a signature"
+msgstr "праверыць подпіс"
+
+#: g10/g10.c:367
+msgid "list keys"
+msgstr "паказаць сьпіс ключоў"
+
+#: g10/g10.c:369
+msgid "list keys and signatures"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "праверыць подпісы ключа"
+
+#: g10/g10.c:371
+msgid "list keys and fingerprints"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: g10/g10.c:372
+msgid "list secret keys"
+msgstr "паказаць сакрэтныя ключы"
+
+#: g10/g10.c:373
+msgid "generate a new key pair"
+msgstr "стварыць новую пару ключоў"
+
+#: g10/g10.c:374
+msgid "remove keys from the public keyring"
+msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
+
+#: g10/g10.c:376
+msgid "remove keys from the secret keyring"
+msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
+
+#: g10/g10.c:377
+msgid "sign a key"
+msgstr "падпісаць ключ"
+
+#: g10/g10.c:378
+msgid "sign a key locally"
+msgstr "падпісаць ключ толькі мясцова"
+
+#: g10/g10.c:381
+msgid "sign or edit a key"
+msgstr "падпісаць ці рэдагаваць ключ"
+
+#: g10/g10.c:382
+msgid "generate a revocation certificate"
+msgstr ""
+
+#: g10/g10.c:384
+msgid "export keys"
+msgstr "экспарт ключоў"
+
+#: g10/g10.c:385
+msgid "export keys to a key server"
+msgstr "экспартаваць ключы на паслужнік ключоў"
+
+#: g10/g10.c:386
+msgid "import keys from a key server"
+msgstr "імпартаваць ключы з паслужніка ключоў"
+
+#: g10/g10.c:388
+msgid "search for keys on a key server"
+msgstr ""
+
+#: g10/g10.c:390
+msgid "update all keys from a keyserver"
+msgstr "абнавіць усе ключы з паслужніка ключоў"
+
+#: g10/g10.c:393
+msgid "import/merge keys"
+msgstr "імпартаваць/аб'яднаць ключы"
+
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
+
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
+
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
+
+#: g10/g10.c:406
+msgid "update the trust database"
+msgstr ""
+
+#: g10/g10.c:413
+msgid "|algo [files]|print message digests"
+msgstr ""
+
+#: g10/g10.c:417 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Выбары:\n"
+" "
+
+#: g10/g10.c:419
+msgid "create ascii armored output"
+msgstr ""
+
+#: g10/g10.c:421
+msgid "|NAME|encrypt for NAME"
+msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
+
+#: g10/g10.c:432
+msgid "use this user-id to sign or decrypt"
+msgstr ""
+
+#: g10/g10.c:433
+msgid "|N|set compress level N (0 disables)"
+msgstr ""
+
+#: g10/g10.c:438
+msgid "use canonical text mode"
+msgstr ""
+
+#: g10/g10.c:448
+msgid "use as output file"
+msgstr "выкарыстоўваць у якасьці файла вываду"
+
+#: g10/g10.c:450 g10/gpgv.c:66
+msgid "verbose"
+msgstr "шматслоўнасьць"
+
+#: g10/g10.c:461
+msgid "do not make any changes"
+msgstr "не рабіць ніякіх зьменаў"
+
+#: g10/g10.c:462
+msgid "prompt before overwriting"
+msgstr "пытацца перад перазапісам"
+
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
+
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:535
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
+
+#: g10/g10.c:538
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"Прыклады:\n"
+"\n"
+" -se -r Bob [файл]          падпісаць і зашыфраваць для карыстальніка Bob\n"
+" --clearsign [файл]         стварыць чысты тэкставы подпіс\n"
+" --detach-sign [файл]       стварыць адчэплены подпіс\n"
+" --list-keys [назвы]        паказаць ключы\n"
+" --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
+
+#: g10/g10.c:713 g10/gpgv.c:91
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
+
+#: g10/g10.c:730
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: g10/g10.c:733
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Сынтаксіс: gpg [выбары] [файлы]\n"
+"sign, check, encrypt ці decrypt\n"
+"Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
+
+#: g10/g10.c:744
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Альгарытмы, якія падтрымліваюцца:\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr ""
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr ""
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr ""
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr ""
+
+#: g10/g10.c:848
+msgid "usage: gpg [options] "
+msgstr "Выкарыстаньне: gpg [выбары] "
+
+#: g10/g10.c:951
+msgid "conflicting commands\n"
+msgstr "несумяшчальныя загады\n"
+
+#: g10/g10.c:969
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1166
+#, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1169
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1172
+#, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1178
+#, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1181
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1184
+#, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1190
+#, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1193
+#, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1196
+#, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1202
+#, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1205
+#, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr ""
+
+#: g10/g10.c:1208
+#, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1601
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr ""
+
+#: g10/g10.c:1637
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr ""
+
+#: g10/g10.c:1641
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr ""
+
+#: g10/g10.c:1648
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr ""
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr ""
+
+#: g10/g10.c:1887
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr ""
+
+#: g10/g10.c:2099
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+msgid "could not parse keyserver URL\n"
+msgstr ""
+
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "недапушчальныя выбары экспартаваньня\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
+
+#: g10/g10.c:2137
+msgid "invalid import options\n"
+msgstr "недапушчальныя выбары імпартаваньня\n"
+
+#: g10/g10.c:2144
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+
+#: g10/g10.c:2147
+msgid "invalid export options\n"
+msgstr "недапушчальныя выбары экспартаваньня\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "недапушчальныя выбары імпартаваньня\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "недапушчальныя выбары экспартаваньня\n"
+
+#: g10/g10.c:2208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:2398
+msgid "WARNING: program may create a core file!\n"
+msgstr ""
+
+#: g10/g10.c:2402
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr ""
+
+#: g10/g10.c:2411
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s не дазваляецца разам з %s!\n"
+
+#: g10/g10.c:2414
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s ня мае сэнсу разам з %s!\n"
+
+#: g10/g10.c:2435
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr ""
+
+#: g10/g10.c:2441
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr ""
+
+#: g10/g10.c:2447
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr ""
+
+#: g10/g10.c:2460
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr ""
+
+#: g10/g10.c:2528 g10/g10.c:2552
+msgid "selected cipher algorithm is invalid\n"
+msgstr ""
+
+#: g10/g10.c:2534 g10/g10.c:2558
+msgid "selected digest algorithm is invalid\n"
+msgstr ""
+
+#: g10/g10.c:2540
+msgid "selected compression algorithm is invalid\n"
+msgstr ""
+
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr ""
+
+#: g10/g10.c:2561
+msgid "completes-needed must be greater than 0\n"
+msgstr ""
+
+#: g10/g10.c:2563
+msgid "marginals-needed must be greater than 1\n"
+msgstr ""
+
+#: g10/g10.c:2565
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr ""
+
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr ""
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr ""
+
+#: g10/g10.c:2572
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr ""
+
+#: g10/g10.c:2576
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr ""
+
+#: g10/g10.c:2583
+msgid "invalid default preferences\n"
+msgstr "недапушчальныя дапомныя перавагі\n"
+
+#: g10/g10.c:2592
+msgid "invalid personal cipher preferences\n"
+msgstr ""
+
+#: g10/g10.c:2596
+msgid "invalid personal digest preferences\n"
+msgstr ""
+
+#: g10/g10.c:2600
+msgid "invalid personal compress preferences\n"
+msgstr ""
+
+#: g10/g10.c:2633
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s ня мае сэнсу разам з %s!\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2778
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr ""
+
+#: g10/g10.c:2789
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:2800
+msgid "--store [filename]"
+msgstr "--store [назва_файла]"
+
+#: g10/g10.c:2807
+msgid "--symmetric [filename]"
+msgstr "--symmetric [назва_файла]"
+
+#: g10/g10.c:2819
+msgid "--encrypt [filename]"
+msgstr "--encrypt [назва_файла]"
+
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [назва_файла]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2855
+msgid "--sign [filename]"
+msgstr "--sign [назва_файла]"
+
+#: g10/g10.c:2868
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [назва_файла]"
+
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [назва_файла]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2908
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [назва_файла]"
+
+#: g10/g10.c:2917
+msgid "--clearsign [filename]"
+msgstr "--clearsign [назва_файла]"
+
+#: g10/g10.c:2942
+msgid "--decrypt [filename]"
+msgstr "--decrypt [назва_файла]"
+
+#: g10/g10.c:2950
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
+#: g10/g10.c:2954
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
+#: g10/g10.c:2958
+msgid "--nrsign-key user-id"
+msgstr "--nrsign-key user-id"
+
+#: g10/g10.c:2962
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key user-id"
+
+#: g10/g10.c:2986
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [загады]"
+
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: g10/g10.c:3057
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr ""
+
+#: g10/g10.c:3094
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/g10.c:3096
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/g10.c:3098
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/g10.c:3109
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr ""
+
+#: g10/g10.c:3160
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr ""
+
+#: g10/g10.c:3168
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr ""
+
+#: g10/g10.c:3255
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/g10.c:3378
+msgid "[filename]"
+msgstr "[назва_файла]"
+
+#: g10/g10.c:3382
+msgid "Go ahead and type your message ...\n"
+msgstr ""
+
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "немагчыма адкрыць \"%s\"\n"
+
+#: g10/g10.c:3659
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr ""
+
+#: g10/g10.c:3678
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
+#: g10/g10.c:3712
+msgid "the given certification policy URL is invalid\n"
+msgstr ""
+
+#: g10/g10.c:3714
+msgid "the given signature policy URL is invalid\n"
+msgstr ""
+
+#: g10/g10.c:3747
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr ""
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "працаваць менш шматслоўна"
+
+#: g10/gpgv.c:68
+#, fuzzy
+msgid "take the keys from this keyring"
+msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr ""
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr ""
+
+#: g10/gpgv.c:95
+#, fuzzy
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+
+#: g10/armor.c:317
+#, c-format
+msgid "armor: %s\n"
+msgstr ""
+
+#: g10/armor.c:346
+msgid "invalid armor header: "
+msgstr ""
+
+#: g10/armor.c:353
+msgid "armor header: "
+msgstr ""
+
+#: g10/armor.c:364
+msgid "invalid clearsig header\n"
+msgstr ""
+
+#: g10/armor.c:416
+msgid "nested clear text signatures\n"
+msgstr ""
+
+#: g10/armor.c:553
+msgid "invalid dash escaped line: "
+msgstr ""
+
+#: g10/armor.c:565
+msgid "unexpected armor:"
+msgstr ""
+
+#: g10/armor.c:695 g10/armor.c:1276
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr ""
+
+#: g10/armor.c:738
+msgid "premature eof (no CRC)\n"
+msgstr ""
+
+#: g10/armor.c:772
+msgid "premature eof (in CRC)\n"
+msgstr ""
+
+#: g10/armor.c:776
+msgid "malformed CRC\n"
+msgstr ""
+
+#: g10/armor.c:780 g10/armor.c:1313
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "памылка CRC; %06lx - %06lx\n"
+
+#: g10/armor.c:800
+msgid "premature eof (in Trailer)\n"
+msgstr ""
+
+#: g10/armor.c:804
+msgid "error in trailer line\n"
+msgstr ""
+
+#: g10/armor.c:1091
+msgid "no valid OpenPGP data found.\n"
+msgstr ""
+
+#: g10/armor.c:1096
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr ""
+
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+
+#: g10/pkclist.c:61 g10/revoke.c:576
+msgid "No reason specified"
+msgstr ""
+
+#: g10/pkclist.c:63 g10/revoke.c:578
+msgid "Key is superseded"
+msgstr ""
+
+#: g10/pkclist.c:65 g10/revoke.c:577
+msgid "Key has been compromised"
+msgstr ""
+
+#: g10/pkclist.c:67 g10/revoke.c:579
+msgid "Key is no longer used"
+msgstr ""
+
+#: g10/pkclist.c:69 g10/revoke.c:580
+msgid "User ID is no longer valid"
+msgstr ""
+
+#: g10/pkclist.c:73
+msgid "reason for revocation: "
+msgstr ""
+
+#: g10/pkclist.c:90
+msgid "revocation comment: "
+msgstr ""
+
+#: g10/pkclist.c:195
+msgid "iImMqQsS"
+msgstr ""
+
+#: g10/pkclist.c:203
+msgid "No trust value assigned to:\n"
+msgstr ""
+
+#: g10/pkclist.c:207
+msgid "          \""
+msgstr ""
+
+#: g10/pkclist.c:234
+msgid "      aka \""
+msgstr ""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:250
+#, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr ""
+
+#: g10/pkclist.c:252
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr ""
+
+#: g10/pkclist.c:254
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr ""
+
+#: g10/pkclist.c:256
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr ""
+
+#: g10/pkclist.c:258
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr ""
+
+#: g10/pkclist.c:261
+msgid " i = please show me more information\n"
+msgstr ""
+
+#: g10/pkclist.c:264
+msgid " m = back to the main menu\n"
+msgstr ""
+
+#: g10/pkclist.c:267
+msgid " s = skip this key\n"
+msgstr ""
+
+#: g10/pkclist.c:268
+msgid " q = quit\n"
+msgstr " q = quit [выйсьці]\n"
+
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
+msgid "Your decision? "
+msgstr ""
+
+#: g10/pkclist.c:299
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr ""
+
+#: g10/pkclist.c:313
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr ""
+
+#: g10/pkclist.c:387
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr ""
+
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
+msgid "Use this key anyway? "
+msgstr ""
+
+#: g10/pkclist.c:399
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr ""
+
+#: g10/pkclist.c:420
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr ""
+
+#: g10/pkclist.c:430
+#, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr ""
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr ""
+
+#: g10/pkclist.c:441
+#, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr ""
+
+#: g10/pkclist.c:447
+msgid "This key probably belongs to the named user\n"
+msgstr ""
+
+#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr ""
+
+#: g10/pkclist.c:500
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:514 g10/pkclist.c:544
+msgid "WARNING: Using untrusted key!\n"
+msgstr ""
+
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr ""
+
+#: g10/pkclist.c:563
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr ""
+
+#: g10/pkclist.c:564
+msgid "         This could mean that the signature is forgery.\n"
+msgstr ""
+
+#: g10/pkclist.c:570
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr ""
+
+#: g10/pkclist.c:575
+msgid "Note: This key has been disabled.\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "Note: This key has expired!\n"
+msgstr ""
+
+#: g10/pkclist.c:591
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr ""
+
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+
+#: g10/pkclist.c:601
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr ""
+
+#: g10/pkclist.c:602
+msgid "         The signature is probably a FORGERY.\n"
+msgstr ""
+
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+
+#: g10/pkclist.c:612
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr ""
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr ""
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr ""
+
+#: g10/pkclist.c:787 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr ""
+
+#: g10/pkclist.c:829
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr ""
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+
+#: g10/pkclist.c:887
+msgid "No such user ID.\n"
+msgstr ""
+
+#: g10/pkclist.c:892 g10/pkclist.c:954
+msgid "skipped: public key already set as default recipient\n"
+msgstr ""
+
+#: g10/pkclist.c:910
+msgid "Public key is disabled.\n"
+msgstr ""
+
+#: g10/pkclist.c:917
+msgid "skipped: public key already set\n"
+msgstr ""
+
+#: g10/pkclist.c:946
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:991
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr ""
+
+#: g10/pkclist.c:1046
+msgid "no valid addressees\n"
+msgstr ""
+
+#: g10/keygen.c:207
+#, c-format
+msgid "preference `%s' duplicated\n"
+msgstr ""
+
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "за шмат пераваг для \"%c\"\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "за шмат пераваг для \"%c\"\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "за шмат пераваг для \"%c\"\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "недапушчальныя дапомныя перавагі\n"
+
+#: g10/keygen.c:738
+msgid "writing direct signature\n"
+msgstr ""
+
+#: g10/keygen.c:777
+msgid "writing self signature\n"
+msgstr ""
+
+#: g10/keygen.c:823
+msgid "writing key binding signature\n"
+msgstr ""
+
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr ""
+
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr ""
+
+#: g10/keygen.c:1165
+msgid "Please select what kind of key you want:\n"
+msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
+
+#: g10/keygen.c:1167
+#, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr ""
+
+#: g10/keygen.c:1168
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr ""
+
+#: g10/keygen.c:1170
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr ""
+
+#: g10/keygen.c:1171
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr ""
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr ""
+
+#: g10/keygen.c:1175
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr ""
+
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+msgid "Your selection? "
+msgstr ""
+
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+msgid "Invalid selection.\n"
+msgstr ""
+
+#: g10/keygen.c:1225
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+
+#: g10/keygen.c:1234
+msgid "What keysize do you want? (1024) "
+msgstr ""
+
+#: g10/keygen.c:1239
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr ""
+
+#: g10/keygen.c:1241
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr ""
+
+#: g10/keygen.c:1244
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr ""
+
+#: g10/keygen.c:1255
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr ""
+
+#: g10/keygen.c:1260
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+
+#: g10/keygen.c:1263
+msgid "Are you sure that you want this keysize? "
+msgstr ""
+
+#: g10/keygen.c:1264
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+
+#: g10/keygen.c:1273
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr ""
+
+#: g10/keygen.c:1276 g10/keygen.c:1280
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr ""
+
+#: g10/keygen.c:1331
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+
+#: g10/keygen.c:1340
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+
+#: g10/keygen.c:1362
+msgid "Key is valid for? (0) "
+msgstr ""
+
+#: g10/keygen.c:1364
+msgid "Signature is valid for? (0) "
+msgstr ""
+
+#: g10/keygen.c:1369
+msgid "invalid value\n"
+msgstr ""
+
+#: g10/keygen.c:1374
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr ""
+
+#: g10/keygen.c:1381
+#, c-format
+msgid "%s expires at %s\n"
+msgstr ""
+
+#: g10/keygen.c:1387
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+
+#: g10/keygen.c:1392
+msgid "Is this correct (y/n)? "
+msgstr ""
+
+#: g10/keygen.c:1435
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1447
+msgid "Real name: "
+msgstr ""
+
+#: g10/keygen.c:1455
+msgid "Invalid character in name\n"
+msgstr ""
+
+#: g10/keygen.c:1457
+msgid "Name may not start with a digit\n"
+msgstr ""
+
+#: g10/keygen.c:1459
+msgid "Name must be at least 5 characters long\n"
+msgstr ""
+
+#: g10/keygen.c:1467
+msgid "Email address: "
+msgstr ""
+
+#: g10/keygen.c:1478
+msgid "Not a valid email address\n"
+msgstr ""
+
+#: g10/keygen.c:1486
+msgid "Comment: "
+msgstr ""
+
+#: g10/keygen.c:1492
+msgid "Invalid character in comment\n"
+msgstr ""
+
+#: g10/keygen.c:1515
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr ""
+
+#: g10/keygen.c:1521
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1526
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr ""
+
+#: g10/keygen.c:1531
+msgid "NnCcEeOoQq"
+msgstr ""
+
+#: g10/keygen.c:1541
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr ""
+
+#: g10/keygen.c:1542
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr ""
+
+#: g10/keygen.c:1561
+msgid "Please correct the error first\n"
+msgstr ""
+
+#: g10/keygen.c:1600
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1609 g10/keyedit.c:1021
+msgid "passphrase not correctly repeated; try again"
+msgstr ""
+
+#: g10/keygen.c:1610
+#, c-format
+msgid "%s.\n"
+msgstr ""
+
+#: g10/keygen.c:1616
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway.  You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1638
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr ""
+
+#: g10/keygen.c:2267
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr ""
+
+#: g10/keygen.c:2335
+msgid "Key generation canceled.\n"
+msgstr ""
+
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr ""
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "запіс у stdout\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr ""
+
+#: g10/keygen.c:2565
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr ""
+
+#: g10/keygen.c:2571
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr ""
+
+#: g10/keygen.c:2589
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr ""
+
+#: g10/keygen.c:2596
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr ""
+
+#: g10/keygen.c:2619
+msgid "public and secret key created and signed.\n"
+msgstr ""
+
+#: g10/keygen.c:2630
+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:2642 g10/keygen.c:2755
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr ""
+
+#: g10/keygen.c:2691 g10/sign.c:290
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+
+#: g10/keygen.c:2693 g10/sign.c:292
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+
+#: g10/keygen.c:2702
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr ""
+
+#: g10/keygen.c:2730
+msgid "Really create? "
+msgstr ""
+
+#: g10/decrypt.c:98 g10/encode.c:845
+msgid "--output doesn't work for this command\n"
+msgstr ""
+
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr ""
+
+#: g10/encode.c:203 g10/sign.c:1144
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr ""
+
+#: g10/encode.c:208
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr ""
+
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr ""
+
+#: g10/encode.c:301 g10/encode.c:590
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr ""
+
+#: g10/encode.c:465
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr ""
+
+#: g10/encode.c:480
+#, c-format
+msgid "reading from `%s'\n"
+msgstr ""
+
+#: g10/encode.c:516
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+
+#: g10/encode.c:526 g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:818
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr ""
+
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr ""
+
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr ""
+
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "Ключ абаронены.\n"
+
+#: g10/export.c:206
+#, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr ""
+
+#: g10/export.c:353
+#, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+
+#: g10/export.c:385
+msgid "WARNING: nothing exported\n"
+msgstr ""
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr ""
+
+#: g10/getkey.c:186 g10/getkey.c:2693
+msgid "[User id not found]"
+msgstr ""
+
+#: g10/getkey.c:1614
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+
+#: g10/getkey.c:2169
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+
+#: g10/getkey.c:2400
+#, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr ""
+
+#: g10/getkey.c:2447
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr ""
+
+#: g10/import.c:241
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr ""
+
+#: g10/import.c:250
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr ""
+
+#: g10/import.c:255
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr ""
+
+#: g10/import.c:267
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr ""
+
+#: g10/import.c:269
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr ""
+
+#: g10/import.c:272
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr ""
+
+#: g10/import.c:274
+#, c-format
+msgid "              imported: %lu"
+msgstr ""
+
+#: g10/import.c:280
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr ""
+
+#: g10/import.c:282
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr ""
+
+#: g10/import.c:284
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr ""
+
+#: g10/import.c:286
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr ""
+
+#: g10/import.c:288
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr ""
+
+#: g10/import.c:290
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr ""
+
+#: g10/import.c:292
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr ""
+
+#: g10/import.c:294
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr ""
+
+#: g10/import.c:296
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr ""
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+msgid "algorithms on these user IDs:\n"
+msgstr ""
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+#: g10/import.c:707
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr ""
+
+#: g10/import.c:722
+#, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr ""
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr ""
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/import.c:746
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr ""
+
+#: g10/import.c:755
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr ""
+
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#, c-format
+msgid "writing to `%s'\n"
+msgstr ""
+
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr ""
+
+#: g10/import.c:785
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr ""
+
+#: g10/import.c:809
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr ""
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: g10/import.c:866
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr ""
+
+#: g10/import.c:869
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr ""
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/import.c:878
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr ""
+
+#: g10/import.c:881
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr ""
+
+#: g10/import.c:902
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr ""
+
+#: g10/import.c:1047
+#, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr ""
+
+#: g10/import.c:1064
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr ""
+
+#: g10/import.c:1075
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr ""
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/import.c:1144
+#, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr ""
+
+#: g10/import.c:1187
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr ""
+
+#: g10/import.c:1219
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr ""
+
+#: g10/import.c:1284
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr ""
+
+#: g10/import.c:1299
+#, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr ""
+
+#: g10/import.c:1301
+#, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr ""
+
+#: g10/import.c:1319
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr ""
+
+#: g10/import.c:1330 g10/import.c:1380
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr ""
+
+#: g10/import.c:1332
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr ""
+
+#: g10/import.c:1347
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr ""
+
+#: g10/import.c:1369
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr ""
+
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+
+#: g10/import.c:1397
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr ""
+
+#: g10/import.c:1439
+#, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr ""
+
+#: g10/import.c:1460
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr ""
+
+#: g10/import.c:1487
+#, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr ""
+
+#: g10/import.c:1497
+#, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr ""
+
+#: g10/import.c:1514
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr ""
+
+#: g10/import.c:1528
+#, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr ""
+
+#: g10/import.c:1536
+#, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr ""
+
+#: g10/import.c:1636
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr ""
+
+#: g10/import.c:1698
+#, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr ""
+
+#: g10/import.c:1711
+#, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr ""
+
+#: g10/import.c:1770
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr ""
+
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "%s: тэчка створана\n"
+
+#: g10/keyedit.c:159
+msgid "[revocation]"
+msgstr ""
+
+#: g10/keyedit.c:160
+msgid "[self-signature]"
+msgstr ""
+
+#: g10/keyedit.c:237 g10/keylist.c:319
+msgid "1 bad signature\n"
+msgstr ""
+
+#: g10/keyedit.c:239 g10/keylist.c:321
+#, c-format
+msgid "%d bad signatures\n"
+msgstr ""
+
+#: g10/keyedit.c:241 g10/keylist.c:323
+msgid "1 signature not checked due to a missing key\n"
+msgstr ""
+
+#: g10/keyedit.c:243 g10/keylist.c:325
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr ""
+
+#: g10/keyedit.c:245 g10/keylist.c:327
+msgid "1 signature not checked due to an error\n"
+msgstr ""
+
+#: g10/keyedit.c:247 g10/keylist.c:329
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr ""
+
+#: g10/keyedit.c:249
+msgid "1 user ID without valid self-signature detected\n"
+msgstr ""
+
+#: g10/keyedit.c:251
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr ""
+
+#: g10/keyedit.c:314
+#, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr ""
+
+#: g10/keyedit.c:315
+#, c-format
+msgid "   (%d) I trust fully\n"
+msgstr ""
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr ""
+
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
+msgid "  Unable to sign.\n"
+msgstr ""
+
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr ""
+
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr ""
+
+#: g10/keyedit.c:584
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:632
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:636
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:657
+#, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr ""
+
+#: g10/keyedit.c:660
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr ""
+
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:687
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr ""
+
+#: g10/keyedit.c:702
+msgid "This key has expired!"
+msgstr "Гэты ключ згубіў састарэў!"
+
+#: g10/keyedit.c:722
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr ""
+
+#: g10/keyedit.c:726
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr ""
+
+#: g10/keyedit.c:759
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:761
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:786
+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:791
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr ""
+
+#: g10/keyedit.c:793
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr ""
+
+#: g10/keyedit.c:795
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr ""
+
+#: g10/keyedit.c:797
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr ""
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr ""
+
+#: g10/keyedit.c:826
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+
+#: g10/keyedit.c:835
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:839
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+
+#: g10/keyedit.c:844
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+
+#: g10/keyedit.c:851
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+
+#: g10/keyedit.c:855
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+
+#: g10/keyedit.c:860
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+
+#: g10/keyedit.c:864
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+
+#: g10/keyedit.c:868
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+
+#: g10/keyedit.c:877
+msgid "Really sign? "
+msgstr ""
+
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/keyedit.c:978
+msgid "This key is not protected.\n"
+msgstr ""
+
+#: g10/keyedit.c:982
+msgid "Secret parts of primary key are not available.\n"
+msgstr ""
+
+#: g10/keyedit.c:986
+msgid "Key is protected.\n"
+msgstr "Ключ абаронены.\n"
+
+#: g10/keyedit.c:1006
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr ""
+
+#: g10/keyedit.c:1012
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
+"\n"
+
+#: g10/keyedit.c:1026
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+
+#: g10/keyedit.c:1029
+msgid "Do you really want to do this? "
+msgstr ""
+
+#: g10/keyedit.c:1095
+msgid "moving a key signature to the correct place\n"
+msgstr ""
+
+#: g10/keyedit.c:1138
+msgid "quit this menu"
+msgstr ""
+
+#: g10/keyedit.c:1139
+msgid "q"
+msgstr ""
+
+#: g10/keyedit.c:1140
+msgid "save"
+msgstr ""
+
+#: g10/keyedit.c:1140
+msgid "save and quit"
+msgstr ""
+
+#: g10/keyedit.c:1141
+msgid "help"
+msgstr "даведка (help)"
+
+#: g10/keyedit.c:1141
+msgid "show this help"
+msgstr "паказаць гэтую даведку"
+
+#: g10/keyedit.c:1143
+msgid "fpr"
+msgstr ""
+
+#: g10/keyedit.c:1143
+msgid "show fingerprint"
+msgstr ""
+
+#: g10/keyedit.c:1144
+msgid "list"
+msgstr ""
+
+#: g10/keyedit.c:1144
+msgid "list key and user IDs"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+#: g10/keyedit.c:1145
+msgid "l"
+msgstr ""
+
+#: g10/keyedit.c:1146
+msgid "uid"
+msgstr ""
+
+#: g10/keyedit.c:1146
+msgid "select user ID N"
+msgstr ""
+
+#: g10/keyedit.c:1147
+msgid "key"
+msgstr ""
+
+#: g10/keyedit.c:1147
+msgid "select secondary key N"
+msgstr ""
+
+#: g10/keyedit.c:1148
+msgid "check"
+msgstr ""
+
+#: g10/keyedit.c:1148
+msgid "list signatures"
+msgstr ""
+
+#: g10/keyedit.c:1149
+msgid "c"
+msgstr ""
+
+#: g10/keyedit.c:1150
+msgid "sign"
+msgstr ""
+
+#: g10/keyedit.c:1150
+msgid "sign the key"
+msgstr ""
+
+#: g10/keyedit.c:1151
+msgid "s"
+msgstr ""
+
+#: g10/keyedit.c:1152
+msgid "tsign"
+msgstr ""
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "зрабіць адчэплены подпіс"
+
+#: g10/keyedit.c:1153
+msgid "lsign"
+msgstr ""
+
+#: g10/keyedit.c:1153
+msgid "sign the key locally"
+msgstr ""
+
+#: g10/keyedit.c:1154
+msgid "nrsign"
+msgstr ""
+
+#: g10/keyedit.c:1154
+msgid "sign the key non-revocably"
+msgstr ""
+
+#: g10/keyedit.c:1155
+msgid "nrlsign"
+msgstr ""
+
+#: g10/keyedit.c:1155
+msgid "sign the key locally and non-revocably"
+msgstr ""
+
+#: g10/keyedit.c:1156
+msgid "debug"
+msgstr ""
+
+#: g10/keyedit.c:1157
+msgid "adduid"
+msgstr ""
+
+#: g10/keyedit.c:1157
+msgid "add a user ID"
+msgstr ""
+
+#: g10/keyedit.c:1158
+msgid "addphoto"
+msgstr ""
+
+#: g10/keyedit.c:1158
+msgid "add a photo ID"
+msgstr ""
+
+#: g10/keyedit.c:1159
+msgid "deluid"
+msgstr ""
+
+#: g10/keyedit.c:1159
+msgid "delete user ID"
+msgstr ""
+
+#: g10/keyedit.c:1161
+msgid "delphoto"
+msgstr ""
+
+#: g10/keyedit.c:1162
+msgid "addkey"
+msgstr ""
+
+#: g10/keyedit.c:1162
+msgid "add a secondary key"
+msgstr ""
+
+#: g10/keyedit.c:1163
+msgid "delkey"
+msgstr ""
+
+#: g10/keyedit.c:1163
+msgid "delete a secondary key"
+msgstr ""
+
+#: g10/keyedit.c:1164
+msgid "addrevoker"
+msgstr ""
+
+#: g10/keyedit.c:1164
+msgid "add a revocation key"
+msgstr ""
+
+#: g10/keyedit.c:1165
+msgid "delsig"
+msgstr ""
+
+#: g10/keyedit.c:1165
+msgid "delete signatures"
+msgstr ""
+
+#: g10/keyedit.c:1166
+msgid "expire"
+msgstr ""
+
+#: g10/keyedit.c:1166
+msgid "change the expire date"
+msgstr ""
+
+#: g10/keyedit.c:1167
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:1167
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:1168
+msgid "toggle"
+msgstr ""
+
+#: g10/keyedit.c:1168
+msgid "toggle between secret and public key listing"
+msgstr ""
+
+#: g10/keyedit.c:1170
+msgid "t"
+msgstr ""
+
+#: g10/keyedit.c:1171
+msgid "pref"
+msgstr ""
+
+#: g10/keyedit.c:1171
+msgid "list preferences (expert)"
+msgstr ""
+
+#: g10/keyedit.c:1172
+msgid "showpref"
+msgstr ""
+
+#: g10/keyedit.c:1172
+msgid "list preferences (verbose)"
+msgstr ""
+
+#: g10/keyedit.c:1173
+msgid "setpref"
+msgstr ""
+
+#: g10/keyedit.c:1173
+msgid "set preference list"
+msgstr ""
+
+#: g10/keyedit.c:1174
+msgid "updpref"
+msgstr ""
+
+#: g10/keyedit.c:1174
+msgid "updated preferences"
+msgstr ""
+
+#: g10/keyedit.c:1175
+msgid "keyserver"
+msgstr ""
+
+#: g10/keyedit.c:1175
+msgid "set preferred keyserver URL"
+msgstr ""
+
+#: g10/keyedit.c:1176
+msgid "passwd"
+msgstr ""
+
+#: g10/keyedit.c:1176
+msgid "change the passphrase"
+msgstr ""
+
+#: g10/keyedit.c:1177
+msgid "trust"
+msgstr ""
+
+#: g10/keyedit.c:1177
+msgid "change the ownertrust"
+msgstr ""
+
+#: g10/keyedit.c:1178
+msgid "revsig"
+msgstr ""
+
+#: g10/keyedit.c:1178
+msgid "revoke signatures"
+msgstr ""
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr ""
+
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revoke a user ID"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+#: g10/keyedit.c:1180
+msgid "revkey"
+msgstr ""
+
+#: g10/keyedit.c:1180
+msgid "revoke a secondary key"
+msgstr ""
+
+#: g10/keyedit.c:1181
+msgid "disable"
+msgstr ""
+
+#: g10/keyedit.c:1181
+msgid "disable a key"
+msgstr ""
+
+#: g10/keyedit.c:1182
+msgid "enable"
+msgstr ""
+
+#: g10/keyedit.c:1182
+msgid "enable a key"
+msgstr ""
+
+#: g10/keyedit.c:1183
+msgid "showphoto"
+msgstr ""
+
+#: g10/keyedit.c:1183
+msgid "show photo ID"
+msgstr ""
+
+#: g10/keyedit.c:1202 g10/delkey.c:120
+msgid "can't do that in batchmode\n"
+msgstr ""
+
+#: g10/keyedit.c:1233
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr ""
+
+#: g10/keyedit.c:1250
+msgid "Secret key is available.\n"
+msgstr "Даступны сакрэтны ключ.\n"
+
+#: g10/keyedit.c:1282
+msgid "Command> "
+msgstr "Загад> "
+
+#: g10/keyedit.c:1312
+msgid "Need the secret key to do this.\n"
+msgstr ""
+
+#: g10/keyedit.c:1316
+msgid "Please use the command \"toggle\" first.\n"
+msgstr ""
+
+#: g10/keyedit.c:1364
+msgid "Key is revoked."
+msgstr ""
+
+#: g10/keyedit.c:1383
+msgid "Really sign all user IDs? "
+msgstr ""
+
+#: g10/keyedit.c:1384
+msgid "Hint: Select the user IDs to sign\n"
+msgstr ""
+
+#: g10/keyedit.c:1409
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+msgid "You must select at least one user ID.\n"
+msgstr ""
+
+#: g10/keyedit.c:1433
+msgid "You can't delete the last user ID!\n"
+msgstr ""
+
+#: g10/keyedit.c:1436
+msgid "Really remove all selected user IDs? "
+msgstr ""
+
+#: g10/keyedit.c:1437
+msgid "Really remove this user ID? "
+msgstr ""
+
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
+msgid "You must select at least one key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1478
+msgid "Do you really want to delete the selected keys? "
+msgstr ""
+
+#: g10/keyedit.c:1479
+msgid "Do you really want to delete this key? "
+msgstr ""
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr ""
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr ""
+
+#: g10/keyedit.c:1534
+msgid "Do you really want to revoke the selected keys? "
+msgstr ""
+
+#: g10/keyedit.c:1535
+msgid "Do you really want to revoke this key? "
+msgstr ""
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+msgid "Set preference list to:\n"
+msgstr ""
+
+#: g10/keyedit.c:1612
+msgid "Really update the preferences for the selected user IDs? "
+msgstr ""
+
+#: g10/keyedit.c:1614
+msgid "Really update the preferences? "
+msgstr ""
+
+#: g10/keyedit.c:1662
+msgid "Save changes? "
+msgstr "Захаваць зьмены? "
+
+#: g10/keyedit.c:1665
+msgid "Quit without saving? "
+msgstr "Выйсьці не захаваўшы зьмены? "
+
+#: g10/keyedit.c:1675
+#, c-format
+msgid "update failed: %s\n"
+msgstr ""
+
+#: g10/keyedit.c:1682
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr ""
+
+#: g10/keyedit.c:1689
+msgid "Key not changed so no update needed.\n"
+msgstr ""
+
+#: g10/keyedit.c:1701
+msgid "Invalid command  (try \"help\")\n"
+msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr ""
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr ""
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr ""
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr ""
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "памылка чытаньня файла"
+
+#: g10/keyedit.c:2084
+#, c-format
+msgid "revoked: %s"
+msgstr ""
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, c-format
+msgid "expires: %s"
+msgstr ""
+
+#: g10/keyedit.c:2103
+#, c-format
+msgid "trust: %s"
+msgstr ""
+
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
+msgid "This key has been disabled"
+msgstr ""
+
+#: g10/keyedit.c:2146
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr ""
+
+#: g10/keyedit.c:2149
+msgid "rev- faked revocation found\n"
+msgstr ""
+
+#: g10/keyedit.c:2151
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr ""
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+msgid "revoked"
+msgstr ""
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+msgid "expired"
+msgstr ""
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr ""
+
+#: g10/keyedit.c:2207
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr ""
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr ""
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2399
+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:2404 g10/keyedit.c:2677
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:2410
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2545
+msgid "Delete this good signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:2555
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:2559
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:2565
+msgid "Really delete this self-signature? (y/N)"
+msgstr ""
+
+#: g10/keyedit.c:2579
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr ""
+
+#: g10/keyedit.c:2580
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr ""
+
+#: g10/keyedit.c:2583
+msgid "Nothing deleted.\n"
+msgstr ""
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2703
+msgid "Enter the user ID of the designated revoker: "
+msgstr ""
+
+#: g10/keyedit.c:2726
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2741
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2763
+msgid "this key has already been designated as a revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+
+#: g10/keyedit.c:2849
+msgid "Please remove selections from the secret keys.\n"
+msgstr ""
+
+#: g10/keyedit.c:2855
+msgid "Please select at most one secondary key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2859
+msgid "Changing expiration time for a secondary key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2862
+msgid "Changing expiration time for the primary key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2908
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr ""
+
+#: g10/keyedit.c:2924
+msgid "No corresponding signature in secret ring\n"
+msgstr ""
+
+#: g10/keyedit.c:3004
+msgid "Please select exactly one user ID.\n"
+msgstr ""
+
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr ""
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr ""
+
+#: g10/keyedit.c:3377
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr ""
+
+#: g10/keyedit.c:3491
+msgid "user ID: \""
+msgstr ""
+
+#: g10/keyedit.c:3496
+#, c-format
+msgid ""
+"\"\n"
+"signed with your key %s at %s\n"
+msgstr ""
+
+#: g10/keyedit.c:3499
+#, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %s at %s\n"
+msgstr ""
+
+#: g10/keyedit.c:3504
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr ""
+
+#: g10/keyedit.c:3508
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:3512
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:3537
+msgid "You have signed these user IDs:\n"
+msgstr ""
+
+#: g10/keyedit.c:3558
+#, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr ""
+
+#: g10/keyedit.c:3567
+#, c-format
+msgid "   revoked by %s on %s\n"
+msgstr ""
+
+#: g10/keyedit.c:3587
+msgid "You are about to revoke these signatures:\n"
+msgstr ""
+
+#: g10/keyedit.c:3597
+#, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr ""
+
+#: g10/keyedit.c:3599
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:3606
+msgid "Really create the revocation certificates? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:3636
+msgid "no secret key\n"
+msgstr ""
+
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr ""
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+
+#: g10/keyedit.c:3892
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr ""
+
+#: g10/keylist.c:179
+msgid "Critical signature policy: "
+msgstr ""
+
+#: g10/keylist.c:181
+msgid "Signature policy: "
+msgstr ""
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
+msgid "WARNING: invalid notation data found\n"
+msgstr ""
+
+#: g10/keylist.c:286
+msgid "Critical signature notation: "
+msgstr ""
+
+#: g10/keylist.c:288
+msgid "Signature notation: "
+msgstr ""
+
+#: g10/keylist.c:299
+msgid "not human readable"
+msgstr ""
+
+#: g10/keylist.c:400
+msgid "Keyring"
+msgstr ""
+
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
+msgid " [expires: %s]"
+msgstr ""
+
+#: g10/keylist.c:646 g10/keylist.c:743
+#, c-format
+msgid " [revoked: %s]"
+msgstr ""
+
+#: g10/keylist.c:1357
+msgid "Primary key fingerprint:"
+msgstr ""
+
+#: g10/keylist.c:1359
+msgid "     Subkey fingerprint:"
+msgstr ""
+
+#: g10/keylist.c:1366
+msgid " Primary key fingerprint:"
+msgstr ""
+
+#: g10/keylist.c:1368
+msgid "      Subkey fingerprint:"
+msgstr ""
+
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr ""
+
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr ""
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr ""
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr ""
+
+#: g10/mainproc.c:305 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr ""
+
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/mainproc.c:428
+msgid "public key encrypted data: good DEK\n"
+msgstr ""
+
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
+
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "Паўтарыце пароль\n"
+
+#: g10/mainproc.c:486
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr ""
+
+#: g10/mainproc.c:500
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "Паўтарыце пароль\n"
+
+#: g10/mainproc.c:502
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "Паўтарыце пароль\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr ""
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr ""
+
+#: g10/mainproc.c:570
+msgid "decryption okay\n"
+msgstr ""
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr ""
+
+#: g10/mainproc.c:587
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:593
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr ""
+
+#: g10/mainproc.c:613
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr ""
+
+#: g10/mainproc.c:615
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr ""
+
+#: g10/mainproc.c:787
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr ""
+
+#: g10/mainproc.c:1283
+msgid "signature verification suppressed\n"
+msgstr ""
+
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
+msgid "can't handle these multiple signatures\n"
+msgstr ""
+
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: g10/mainproc.c:1346
+#, c-format
+msgid "               using %s key %s\n"
+msgstr ""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: g10/mainproc.c:1370
+#, fuzzy
+msgid "Key available at: "
+msgstr "Даведка адсутнічае"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr ""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
+msgid "Expired signature from \""
+msgstr ""
+
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
+msgid "Good signature from \""
+msgstr ""
+
+#: g10/mainproc.c:1510
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr ""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr ""
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr ""
+
+#: g10/mainproc.c:1646
+#, fuzzy, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr ""
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr ""
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+#, fuzzy
+msgid "unknown"
+msgstr "невядомая вэрсыя"
+
+#: g10/mainproc.c:1668
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr ""
+
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
+msgid "not a detached signature\n"
+msgstr ""
+
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+
+#: g10/mainproc.c:1787
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr ""
+
+#: g10/mainproc.c:1844
+msgid "old style (PGP 2.x) signature\n"
+msgstr ""
+
+#: g10/mainproc.c:1854
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr ""
+
+#: g10/misc.c:82
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr ""
+
+#: g10/misc.c:146
+msgid "Experimental algorithms should not be used!\n"
+msgstr ""
+
+#: g10/misc.c:176
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+
+#: g10/misc.c:282
+msgid "the IDEA cipher plugin is not present\n"
+msgstr ""
+
+#: g10/misc.c:283
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+
+#: g10/misc.c:491
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr ""
+
+#: g10/misc.c:495
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr ""
+
+#: g10/misc.c:497
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr ""
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr ""
+
+#: g10/misc.c:533
+msgid "uncompressed|none"
+msgstr ""
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr ""
+
+#: g10/misc.c:777
+#, c-format
+msgid "ambiguous option `%s'\n"
+msgstr ""
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "невядомая вэрсыя"
+
+#: g10/parse-packet.c:120
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr ""
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1128
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr ""
+
+#: g10/passphrase.c:461 g10/passphrase.c:508
+msgid "gpg-agent is not available in this session\n"
+msgstr ""
+
+#: g10/passphrase.c:469
+msgid "can't set client pid for the agent\n"
+msgstr ""
+
+#: g10/passphrase.c:477
+msgid "can't get server read FD for the agent\n"
+msgstr ""
+
+#: g10/passphrase.c:484
+msgid "can't get server write FD for the agent\n"
+msgstr ""
+
+#: g10/passphrase.c:517
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr ""
+
+#: g10/passphrase.c:530
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr ""
+
+#: g10/passphrase.c:551
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr ""
+
+#: g10/passphrase.c:573
+msgid "communication problem with gpg-agent\n"
+msgstr ""
+
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+msgid "problem with the agent - disabling agent use\n"
+msgstr ""
+
+#: g10/passphrase.c:681
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:691
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для карыстальніка:\n"
+"\"%.*s\"\n"
+"%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
+
+#: g10/passphrase.c:713
+msgid "Repeat passphrase\n"
+msgstr "Паўтарыце пароль\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Увядзіце пароль\n"
+
+#: g10/passphrase.c:753
+msgid "passphrase too long\n"
+msgstr "пароль занадта доўгі\n"
+
+#: g10/passphrase.c:766
+msgid "invalid response from agent\n"
+msgstr ""
+
+#: g10/passphrase.c:781 g10/passphrase.c:874
+msgid "cancelled by user\n"
+msgstr "скасавана карыстальнікам\n"
+
+#: g10/passphrase.c:786 g10/passphrase.c:963
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr ""
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr ""
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Увядзіце пароль: "
+
+#: g10/passphrase.c:1131
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
+"карыстальніка: \""
+
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
+
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1153
+#, c-format
+msgid " (main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1213
+msgid "Repeat passphrase: "
+msgstr "Паўтарыце пароль: "
+
+#: g10/plaintext.c:90
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr ""
+
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/plaintext.c:438
+msgid "Detached signature.\n"
+msgstr ""
+
+#: g10/plaintext.c:442
+msgid "Please enter name of data file: "
+msgstr "Калі ласка, задайце назву файла даньняў: "
+
+#: g10/plaintext.c:463
+msgid "reading stdin ...\n"
+msgstr "чытаецца stdin ...\n"
+
+#: g10/plaintext.c:497
+msgid "no signed data\n"
+msgstr ""
+
+#: g10/plaintext.c:505
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr ""
+
+#: g10/pubkey-enc.c:103
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr ""
+
+#: g10/pubkey-enc.c:119
+msgid "okay, we are the anonymous recipient.\n"
+msgstr ""
+
+#: g10/pubkey-enc.c:207
+msgid "old encoding of the DEK is not supported\n"
+msgstr ""
+
+#: g10/pubkey-enc.c:228
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr ""
+
+#: g10/pubkey-enc.c:266
+#, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr ""
+
+#: g10/pubkey-enc.c:286
+#, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr ""
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr ""
+
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr ""
+
+#: g10/seckey-cert.c:60
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr ""
+
+#: g10/seckey-cert.c:71
+#, c-format
+msgid "protection digest %d is not supported\n"
+msgstr ""
+
+#: g10/seckey-cert.c:250
+msgid "Invalid passphrase; please try again"
+msgstr "Недапушчальны пароль. Калі ласка, паспрабуйце шчэ раз"
+
+#: g10/seckey-cert.c:251
+#, c-format
+msgid "%s ...\n"
+msgstr ""
+
+#: g10/seckey-cert.c:311
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr ""
+
+#: g10/seckey-cert.c:349
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:75
+msgid "WARNING: signature digest conflict in message\n"
+msgstr ""
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr ""
+
+#: g10/sig-check.c:102
+#, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr ""
+
+#: g10/sig-check.c:168
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr ""
+
+#: g10/sig-check.c:169
+#, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr ""
+
+#: g10/sig-check.c:180
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+
+#: g10/sig-check.c:182
+#, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+
+#: g10/sig-check.c:192
+#, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr ""
+
+#: g10/sig-check.c:275
+#, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+
+#: g10/sig-check.c:532
+#, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr ""
+
+#: g10/sig-check.c:558
+#, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr ""
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+
+#: g10/sign.c:112
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:159
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:187
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:364
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr ""
+
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/sign.c:550
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr ""
+
+#: g10/sign.c:741
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+
+#: g10/sign.c:765 g10/sign.c:1001
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr ""
+
+#: g10/sign.c:794
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/sign.c:886
+msgid "signing:"
+msgstr ""
+
+#: g10/sign.c:985
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+
+#: g10/sign.c:1138
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr ""
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr ""
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr ""
+
+#: g10/tdbio.c:128 g10/tdbio.c:1434
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:134 g10/tdbio.c:1441
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr ""
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr ""
+
+#: g10/tdbio.c:497
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr ""
+
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr ""
+
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr ""
+
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr ""
+
+#: g10/tdbio.c:549
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr ""
+
+#: g10/tdbio.c:552
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr ""
+
+#: g10/tdbio.c:592
+msgid "NOTE: trustdb not writable\n"
+msgstr ""
+
+#: g10/tdbio.c:608
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr ""
+
+#: g10/tdbio.c:640
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+
+#: g10/tdbio.c:648
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:1163
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:1171
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr ""
+
+#: g10/tdbio.c:1192
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr ""
+
+#: g10/tdbio.c:1210
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr ""
+
+#: g10/tdbio.c:1215
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr ""
+
+#: g10/tdbio.c:1400
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:1408
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:1418
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:1448
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:1493
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr ""
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr ""
+
+#: g10/trustdb.c:257
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr ""
+
+#: g10/trustdb.c:295
+#, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:310
+#, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr ""
+
+#: g10/trustdb.c:320
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr ""
+
+#: g10/trustdb.c:344
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:350
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr ""
+
+#: g10/trustdb.c:365 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:380 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+msgid "never"
+msgstr ""
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
+msgid "no need for a trustdb check\n"
+msgstr ""
+
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr ""
+
+#: g10/trustdb.c:559
+#, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:574
+#, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr ""
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr ""
+
+#: g10/trustdb.c:1925
+#, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr ""
+
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr ""
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
+#: 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:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr ""
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr ""
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr ""
+
+#: g10/skclist.c:179
+#, c-format
+msgid ""
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "Файл \"%s\" ужо йснуе. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Перазапісаць (y/N)?"
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr ""
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Увядзіце новае ймя файла"
+
+#: g10/openfile.c:183
+msgid "writing to stdout\n"
+msgstr "запіс у stdout\n"
+
+#: g10/openfile.c:282
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr ""
+
+#: g10/openfile.c:349
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr ""
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+
+#: g10/openfile.c:380
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: тэчка створана\n"
+
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr ""
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr ""
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr ""
+
+#: g10/seskey.c:210
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n"
+
+#: g10/delkey.c:121 g10/delkey.c:128
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:127
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr ""
+
+#: g10/delkey.c:139
+msgid "Delete this key from the keyring? "
+msgstr ""
+
+#: g10/delkey.c:147
+msgid "This is a secret key! - really delete? "
+msgstr ""
+
+#: g10/delkey.c:157
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr ""
+
+#: g10/delkey.c:167
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:195
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr ""
+
+#: g10/delkey.c:197
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr ""
+
+#: g10/helptext.c:48
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+
+#: g10/helptext.c:54
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+
+#: g10/helptext.c:61
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr ""
+
+#: g10/helptext.c:65
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr ""
+
+#: g10/helptext.c:73
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+
+#: g10/helptext.c:87
+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:94
+msgid "Enter the size of the key"
+msgstr ""
+
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
+msgid "Answer \"yes\" or \"no\""
+msgstr ""
+
+#: g10/helptext.c:108
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+
+#: g10/helptext.c:120
+msgid "Enter the name of the key holder"
+msgstr ""
+
+#: g10/helptext.c:125
+msgid "please enter an optional but highly suggested email address"
+msgstr ""
+
+#: g10/helptext.c:129
+msgid "Please enter an optional comment"
+msgstr ""
+
+#: g10/helptext.c:134
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+
+#: g10/helptext.c:143
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr ""
+
+#: g10/helptext.c:151
+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"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+
+#: g10/helptext.c:189
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr ""
+
+#: g10/helptext.c:193
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+
+#: g10/helptext.c:198
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr ""
+
+#: g10/helptext.c:203
+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:208
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+
+#: g10/helptext.c:214
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+
+#: g10/helptext.c:218
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+
+#: g10/helptext.c:226
+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:233
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr ""
+
+#: g10/helptext.c:239
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr ""
+
+#: g10/helptext.c:243
+msgid "Give the name of the file to which the signature applies"
+msgstr ""
+
+#: g10/helptext.c:248
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Адкажыце \"так\", калі Вы згодны з перазапісам файла"
+
+#: g10/helptext.c:253
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+
+#: g10/helptext.c:259
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+
+#: g10/helptext.c:275
+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:290
+msgid "No help available"
+msgstr "Даведка адсутнічае"
+
+#: g10/helptext.c:298
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Для \"%s\" даведка адсутнічае"
+
+#: g10/keydb.c:189
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr ""
+
+#: g10/keydb.c:196
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr ""
+
+#: g10/keydb.c:615
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr ""
+
+#: g10/keyring.c:1236
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr ""
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr ""
+
+#: g10/keyring.c:1239
+#, c-format
+msgid "%s is the new one\n"
+msgstr ""
+
+#: g10/keyring.c:1240
+msgid "Please fix this possible security flaw\n"
+msgstr ""
+
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "немагчыма адкрыць \"%s\"\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: створаны зьвязак ключоў\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr ""
+
+#: g10/photoid.c:87
+#, fuzzy, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr ""
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr ""
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr ""
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr ""
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr ""
+
+#: g10/exec.c:184
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr ""
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr ""
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr ""
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr ""
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr ""
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr ""
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr ""
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, fuzzy, c-format
+msgid "build_packet failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr ""
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr ""
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr ""
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr ""
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, fuzzy, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr ""
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr ""
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr ""
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr ""
+
+#: g10/revoke.c:492
+#, fuzzy
+msgid "unknown protection algorithm\n"
+msgstr "невядомы альгарытм сьцісканьня"
+
+#: g10/revoke.c:496
+#, fuzzy
+msgid "NOTE: This key is not protected!\n"
+msgstr "Ключ абаронены.\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+
+#: g10/revoke.c:588
+#, fuzzy
+msgid "Please select the reason for the revocation:\n"
+msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr ""
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr ""
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr ""
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr ""
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr ""
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+
+#: g10/tdbdump.c:140
+#, fuzzy, c-format
+msgid "can't open file: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: g10/tdbdump.c:151
+#, fuzzy
+msgid "line too long\n"
+msgstr "пароль занадта доўгі\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr ""
+
+#: g10/tdbdump.c:164
+#, fuzzy
+msgid "error: invalid fingerprint\n"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr ""
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr ""
+
+#: g10/tdbdump.c:208
+#, fuzzy, c-format
+msgid "read error: %s\n"
+msgstr "памылка чытаньня файла"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[файлы]|зашыфраваць файлы"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[файлы]|разшыфраваць файлы"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "заўсёдвы выкарыстоўваць MDC для шыфраваньня"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "ніколі не выкарыстоўваць MDC для шыфраваньня"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|НАЗВА|     усталяваць мноства знакаў тэрмінала"
+
+#~ msgid " (default)"
+#~ msgstr " (дапомна)"
+
+#~ msgid "Policy: "
+#~ msgstr "Палітыка:"
+
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "quit [выйсьці]"
diff --git a/po/ca.po b/po/ca.po
index e4545965e..4e6627416 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,63 +1,100 @@
-# Missatges de gnupg en catal�
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Carles Sadurn� Anguita <[email protected]>, 2001.
-# Jordi Mallach <[email protected]>, 2001, 2002.
+# Missatges de gnupg en catal�.
+# Copyright � 2001, 2002, 2003 Free Software Foundation, Inc.
+# Carles Sadurn� Anguita <[email protected]>, 2001.
+# Jordi Mallach <[email protected]>, 2001, 2002, 2003.
 #
-# Coses:
-# ID d'usuari �s mascul�?
+# Coses (jm):
+# ID d'usuari �s mascul�? Hi ha una mescla...
+# (ivb:  ID == identificador -> mascul�)
 # Canviar ID -> ID d'usuari
 # Xifratge vs. Xifrat
+# (ivb:  xifratge -> acci�, xifrat -> adjectiu)
+# + coses (ivb):
+#   - Algunes frases incompletes �x desconegut� -> �x �s desconegut�.
+#   - �algoritme� o �algorisme�?  (ambd�s s�n correctes)
+#   - digest -> resum
+#   - �anell� o �clauer�?  (key ring -> clauer)
+#   - bug -> error?  (del recull)
+#   - Crec q uses m�s �signatura� q �firma�; unifique.
+#   - Usar maj�scules x ressaltar (com original)?
+#   - Hi ha cert desordre en les cometes ;)
+#   - Frases �ndies completades.
+#   - Algunes incoher�ncies: error {en la lectura,en llegir,mentre es llegia}
+#   - Probablement he clavat la pota en tots els Photo ID :P
+#   - Nom�s es maneja amb les mans.
+#   - sapigueu -> sapieu? (x coher�ncia)
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-06-03 20:37+0200\n"
-"Last-Translator: Jordi Mallach <[email protected]>\n"
+"Project-Id-Version: gnupg 1.2.4rc\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-12-05 19:15+0100\n"
+"Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "Alerta: esteu usant mem�ria insegura!\n"
+msgstr "AV�S: esteu usant mem�ria insegura!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
+"si us plau, visiteu http://www.gnupg.org/faq.html per a m�s informaci�\n"
 
-#: util/secmem.c:326
+# �ltimament pense si �iniciar� no ser� millor que �inicialitzar�?  ivb
+# Segons SC, hi ha difer�ncia. jm
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "l'operaci� no �s possible sense mem�ria segura inicialitzada\n"
+msgstr "l'operaci� no �s possible sense mem�ria segura inicialitzada\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
-msgstr "s�"
+msgstr "s�|si"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
-msgstr "eixir"
+msgstr "ix"
 
-#: util/miscutil.c:336
+# �xX�?  ivb
+#: util/miscutil.c:351
 msgid "qQ"
-msgstr "qQ"
+msgstr "xX"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: util/errors.c:54
 msgid "general error"
@@ -65,47 +102,47 @@ msgstr "error general"
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "tipus de paquet desconegut"
+msgstr "el tipus de paquet �s desconegut"
 
 #: util/errors.c:56
 msgid "unknown version"
-msgstr "versi� desconeguda"
+msgstr "la versi� �s desconeguda"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "algoritme de clau p�blica desconegut"
+msgstr "l'algoritme de clau p�blica �s desconegut"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "algoritme de digest desconegut"
+msgstr "l'algoritme de resum �s desconegut"
 
 #: util/errors.c:59
 msgid "bad public key"
-msgstr "clau p�blica err�nia"
+msgstr "la clau p�blica �s err�nia"
 
 #: util/errors.c:60
 msgid "bad secret key"
-msgstr "clau secreta err�nia"
+msgstr "la clau secreta �s err�nia"
 
 #: util/errors.c:61
 msgid "bad signature"
-msgstr "signatura err�nia"
+msgstr "la signatura �s err�nia"
 
 #: util/errors.c:62
 msgid "checksum error"
-msgstr "suma de control err�nia"
+msgstr "la suma de control �s err�nia"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "contrasenya err�nia"
+msgstr "la contrasenya �s err�nia"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "no s'ha trobat la clau p�blica"
+msgstr "no s'ha trobat la clau p�blica"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "algoritme de xifrat desconegut"
+msgstr "l'algoritme de xifratge �s desconegut"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
@@ -113,11 +150,11 @@ msgstr "no s'ha pogut obrir l'anell"
 
 #: util/errors.c:67
 msgid "invalid packet"
-msgstr "paquet inv�lid"
+msgstr "el paquet �s inv�lid"
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "armadura inv�lida"
+msgstr "l'armadura �s inv�lida"
 
 #: util/errors.c:69
 msgid "no such user id"
@@ -125,19 +162,22 @@ msgstr "no s'ha trobat l'id de l'usuari"
 
 #: util/errors.c:70
 msgid "secret key not available"
-msgstr "la clau secreta no est� disponible"
+msgstr "la clau secreta no est� disponible"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
 msgstr "s'ha utilitzat una clau secreta incorrecta"
 
+# G�nere?  Nombre?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
 #: util/errors.c:72
 msgid "not supported"
-msgstr "no suportat"
+msgstr "no �s suportat"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "clau incorrecta"
+msgstr "la clau �s incorrecta"
 
 #: util/errors.c:74
 msgid "file read error"
@@ -149,7 +189,7 @@ msgstr "error d'escriptura"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "algoritme de compressi� desconegut"
+msgstr "l'algoritme de compressi� �s desconegut"
 
 #: util/errors.c:77
 msgid "file open error"
@@ -157,47 +197,47 @@ msgstr "error en l'obertura del fitxer"
 
 #: util/errors.c:78
 msgid "file create error"
-msgstr "error en la creaci� del fitxer"
+msgstr "error en la creaci� del fitxer"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "contrasenya inv�lida"
+msgstr "la contrasenya �s inv�lida"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "algoritme de clau p�blica no implementat"
+msgstr "l'algoritme de clau p�blica no �s implementat"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "algoritme de xifrat no implementat"
+msgstr "l'algoritme de xifratge no �s implementat"
 
 #: util/errors.c:82
 msgid "unknown signature class"
-msgstr "classe de signatura desconeguda"
+msgstr "la classe de signatura �s desconeguda"
 
 #: util/errors.c:83
 msgid "trust database error"
-msgstr "error de la base de dades de confian�a"
+msgstr "error de la base de dades de confian�a"
 
 #: util/errors.c:84
 msgid "bad MPI"
-msgstr "MPI erroni"
+msgstr "l'MPI �s erroni"
 
 #: util/errors.c:85
 msgid "resource limit"
-msgstr "l�mit de recursos"
+msgstr "l�mit de recursos"
 
 #: util/errors.c:86
 msgid "invalid keyring"
-msgstr "l'anell no �s v�lid"
+msgstr "l'anell no �s v�lid"
 
 #: util/errors.c:87
 msgid "bad certificate"
-msgstr "certificat incorrecte"
+msgstr "el certificat �s incorrecte"
 
 #: util/errors.c:88
 msgid "malformed user id"
-msgstr "id d'usuari mal formada"
+msgstr "l'id d'usuari �s malformat"
 
 #: util/errors.c:89
 msgid "file close error"
@@ -209,7 +249,7 @@ msgstr "error en el reanomenament del fitxer"
 
 #: util/errors.c:91
 msgid "file delete error"
-msgstr "error a l'eliminar fitxer"
+msgstr "error en l'eliminaci� del fitxer"
 
 #: util/errors.c:92
 msgid "unexpected data"
@@ -219,123 +259,143 @@ msgstr "dades inesperades"
 msgid "timestamp conflict"
 msgstr "conflicte de data"
 
+# Ac� veus pq jo pose �no �s v�lid� en comptes de ��s inv�lid�.  ivb
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
-msgstr "algoritme de clau p�blica inusable"
+msgstr "l'algoritme de clau p�blica �s inusable"
 
 #: util/errors.c:95
 msgid "file exists"
 msgstr "el fitxer existeix"
 
+# Segons context: la clau �s feble?  ivb
 #: util/errors.c:96
 msgid "weak key"
 msgstr "clau feble"
 
 #: util/errors.c:97
 msgid "invalid argument"
-msgstr "argument inv�lid"
+msgstr "l'argument �s inv�lid"
 
+# La �U� �s masculina o femenina?  ivb
 #: util/errors.c:98
 msgid "bad URI"
-msgstr "URI err�nia"
+msgstr "l'URI �s err�nia"
 
+# �dem.  ivb
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "URI no suportada"
+msgstr "l'URI no �s suportada"
 
 #: util/errors.c:100
 msgid "network error"
 msgstr "error de la xarxa"
 
+# G�nere?  Nombre?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "no xifrat"
+msgstr "no �s xifrat"
 
+# G�nere?  Nombre?  Passat, futur?  ivb
+# Probablement �s una clau, femen�. jm
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
 #: util/errors.c:103
 msgid "not processed"
 msgstr "no processat"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
-msgstr "clau p�blica inusable"
+msgstr "ls clau p�blica �s inusable"
 
 #: util/errors.c:106
 msgid "unusable secret key"
-msgstr "clau secreta inusable"
+msgstr "la clau secreta �s inusable"
 
+# �del servidor�, �en el servidor�?  ivb
 #: util/errors.c:107
-#, fuzzy
 msgid "keyserver error"
-msgstr "error general"
+msgstr "error de servidor de claus"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... a�� �s un bug (%s:%d:%s)\n"
+msgstr "... a�� �s un bug (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "no s'ha pogut obrir �%s�: %s\n"
+msgstr "no s'ha pogut obrir �%s�: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "no es pot fer stat de �%s�: %s\n"
+msgstr "no es pot fer stat de �%s�: %s\n"
 
-#: cipher/random.c:390
+# Descartar, deixar passar...  ignorar �s un anglicisme.  ivb
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "�%s� no �s un fitxer regular: s'ignorar�\n"
+msgstr "�%s� no �s un fitxer regular: es descarta\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
-msgstr "nota: el fitxer random_seed �s buit\n"
+msgstr "nota: el fitxer random_seed �s buit\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "alerta: el tamany del fitxer random_seed no �s v�lid - no s'usar�\n"
+msgstr ""
+"AV�S: el tamany del fitxer random_seed no �s v�lid - no s'usar�\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "no s'ha pogut llegir �%s�: %s\n"
+msgstr "no s'ha pogut llegir �%s�: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "no s'ha pogut crear �%s�: %s\n"
+msgstr "no s'ha pogut crear �%s�: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "no s'ha pogut escriure �%s�: %s\n"
+msgstr "no s'ha pogut escriure �%s�: %s\n"
 
-#: cipher/random.c:477
+# No em passe! ;)  ivb
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "no s'ha pogut tancar `%s': %s\n"
+msgstr "no s'ha pogut tancar �%s�: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "ALERTA: esteu usant un generador de nombres aleatoris insegur!!\n"
+msgstr "AV�S: esteu usant un generador de nombres aleatoris insegur!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -343,8 +403,8 @@ msgid ""
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"El generador de nombres aleatoris �s nom�s un peda�\n"
-"per a que funcioni - de cap manera �s un GNA fort!\n"
+"El generador de nombres aleatoris �s nom�s un peda�\n"
+"per a que funcioni - de cap manera �s un GNA fort!\n"
 "\n"
 "NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n"
 "\n"
@@ -357,11 +417,36 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 "\n"
-"No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa perqu� el\n"
-"sistema tinga oportunitat de recollir m�s entropia. (Fan falta %d bytes "
-"m�s)\n"
+"No hi ha prou bytes aleatoris. Per favor, feu alguna altra cosa per que el\n"
+"sistema tinga oportunitat de recollir m�s entropia. (Calen %d bytes "
+"m�s)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+"l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n"
 
-#: g10/g10.c:307
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n"
+"vos ajuda no avorrir-vos, ja que ajudar� a la qualitat de la entropia.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -369,170 +454,130 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
-msgstr "crea una firma separada"
+msgstr "crea una signatura separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr ""
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
-msgstr "xifra nom�s amb xifratge sim�tric"
-
-#: g10/g10.c:315
-msgid "store only"
-msgstr "nom�s emmagatzema"
+msgstr "xifra nom�s amb xifratge sim�tric"
 
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr ""
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
-#: g10/g10.c:323
-msgid "check key signatures"
-msgstr "comprova les signatures de les claus"
+# �de les claus� o �de la clau�?  ivb
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "comprova les signatures de la claus"
 
-#: g10/g10.c:324
+# �dactilars� o �digitals�?  ivb
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
-msgstr "llista claus i empremtes dactilars"
+msgstr "llista claus i empremtes digitals"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/g10.c:327
-#, fuzzy
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
-msgstr "elimina una clau de l'anell p�blic"
+msgstr "elimina claus de l'anell p�blic"
 
-#: g10/g10.c:329
-#, fuzzy
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
-msgstr "elimina clau de l'anell secret"
+msgstr "elimina claus de l'anell secret"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
-msgstr "firma una clau"
+msgstr "signa una clau"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
-msgstr "signa localment una clau"
-
-#: g10/g10.c:332
-#, fuzzy
-msgid "sign a key non-revocably"
-msgstr "signa localment una clau"
-
-#: g10/g10.c:333
-#, fuzzy
-msgid "sign a key locally and non-revocably"
-msgstr "signa localment una clau"
+msgstr "signa una clau localment"
 
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
-msgstr "genera un certificat de revocament"
+msgstr "genera un certificat de revocaci�"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/g10.c:341
-#, fuzzy
+#: g10/g10.c:388
 msgid "search for keys on a key server"
-msgstr "exporta claus a un servidor de claus"
+msgstr "cerca claus en un servidor de claus"
 
-#: g10/g10.c:343
-#, fuzzy
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
-msgstr "importa claus d'un servidor de claus"
+msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "llista nom�s la seq��ncia de paquets"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "exporta els valors de confian�a"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importa els valors de confian�a"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
-msgstr "actualitza la base de dades de confian�a"
-
-#: g10/g10.c:357
-#, fuzzy
-msgid "unattended trust database update"
-msgstr "actualitza la base de dades de confian�a"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "arregla una base de dades de confian�a corrompuda"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "lleva l'armadura a un fitxer o a stdin"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "crea l'armadura a un fitxer o a stdin"
+msgstr "actualitza la base de dades de confian�a"
 
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
-msgstr "|algo [fitxers]imprimeix digests de missatges"
+msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -542,215 +587,67 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOM|usa NOM com a destinatari predeterminat"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "usa la clau predeterminada com a destinatari predeterminat"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|nivell de compressi� N (0 no comprimeix)"
+msgstr "|N|nivell de compressi� N (0 no comprimeix)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
-msgstr "usa mode de text can�nic"
+msgstr "usa el mode de text can�nic"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-# Cal comprovar el context. jm
-#: g10/g10.c:393
+# Un dels dos �s en la llista d'opcions amb --help. Urgh. jm
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detall"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "una mica m�s silenci�s"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "no usa el terminal en absolut"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "for�a signatures v3"
-
-#: g10/g10.c:397
-#, fuzzy
-msgid "do not force v3 signatures"
-msgstr "for�a signatures v3"
-
-#: g10/g10.c:398
-#, fuzzy
-msgid "force v4 key signatures"
-msgstr "for�a signatures v3"
-
-#: g10/g10.c:399
-#, fuzzy
-msgid "do not force v4 key signatures"
-msgstr "for�a signatures v3"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "sempre utilitza un MDC per a xifrar"
-
-#: g10/g10.c:402
-#, fuzzy
-msgid "never use a MDC for encryption"
-msgstr "sempre utilitza un MDC per a xifrar"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "utilitza el gpg-agent"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "mode batch: no pregunta mai"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "suposa �s�� en la majoria de les preguntes"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "suposa �no� en la majoria de les preguntes"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "afegeix aquest anell a la llista"
+msgstr "pregunta abans de sobreescriure"
 
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "afegeix aquest anell secret a la llista"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr ""
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOM|usa NOM com a clau secreta predeterminada"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|usa aquest servidor per a buscar claus"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOM|el joc de car�cters ser� NOM"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "llig opcions del fitxer"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|escriu informaci� d'estat en aquest FD"
-
-#: g10/g10.c:427
-#, fuzzy
-msgid "|[file]|write status info to file"
-msgstr "|FD|escriu informaci� d'estat en aquest FD"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|IDCLAU|confia definitivament en aquesta clau"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FITXER|carrega el m�dul d'extensi� especificat"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emula el mode descrit en RFC1991"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr ""
-"estableix totes les opcions de paquets, xifrat i digest al comportament "
-"d'OpenPGP"
-
-#: g10/g10.c:443
-#, fuzzy
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"estableix totes les opcions de paquets, xifrat i digest al comportament "
-"d'OpenPGP"
 
-#: g10/g10.c:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|usa el mode de contrasenya especificat"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NOM|usa l'algoritme de digest de missatges NOM per a les contrasenyes"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOM|usa l'algoritme de xifratge NOM"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOM|usa l'algoritme de digest de missatges NOM"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|usa l'algoritme de compressi� N"
-
-# elimina o descarta? jm
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "descarta el camp keyid dels paquets xifrats"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr ""
-
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 "@\n"
-"(En la p�gina del man hi ha una llista completa d'ordres i d'opcions)\n"
+"(En la p�gina del man hi ha una llista completa d'ordres i d'opcions)\n"
 
-#: g10/g10.c:471
+# Crec q (A)lice (orig.), (B)ob (dest.), etc. s�n noms usats pel Zimmerman
+# en el manual original de PGP.  A, B, C...  ivb
+# En efecte. Idem per a Mallory m�s endavant. Els deixe com a l'original. jm
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -764,21 +661,21 @@ msgstr ""
 "@\n"
 "Exemples:\n"
 "\n"
-" -se -r Pep [fitxer]        signa i xifra per a l'usuari Pep\n"
+" -se -r Bob [fitxer]        signa i xifra per a l'usuari Bob\n"
 " --clearsign [fitxer]       crea una signatura en text clar\n"
 " --detach-sign [fitxer]     crea una signatura separada\n"
 " --list-keys [noms]         mostra claus\n"
-" --fingerprint [noms]       mostra empremtes dactilars\n"
+" --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
-msgstr "Per favor informeu sobre els errors a <[email protected]>.\n"
+msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
-msgstr "�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+msgstr "Forma d'�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -786,794 +683,1030 @@ msgid ""
 msgstr ""
 "Sintaxi: gpg [opcions] [fitxers]\n"
 "signa, comprova, xifra o desxifra\n"
-"l'operaci� predeterminada dep�n de les dades introdu�des\n"
-
-#: g10/g10.c:641
+"l'operaci� predeterminada dep�n de les dades introdu�des\n"
+
+# Suportats? ivb
+# A Softcatal� diuen molt �implementat?. jm
+# Precissament acabem de parlar d'�implementat a la llista del GNOME
+# i s'ha dit que �s erroni, igual que �suportat� :) Les alternatives
+# encara no m'agraden massa... jm
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 "\n"
-"Algoritmes admesos:\n"
+"Algoritmes suportats:\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Clau p�blica: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Xifratge: "
 
-#: g10/g10.c:745
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Dispersi�: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Compressi�: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
-msgstr "�s: gpg [opcions] "
+msgstr "forma d'�s: gpg [opcions] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
-msgstr "ordres en conflicte\n"
+msgstr "les ordres entren en conflicte\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
+msgstr "no s'ha trobat cap signe = en la definici� de grup �%s�\n"
+
+# Indi. ivb
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
+
+# Indi. ivb
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
+
+# Indi. ivb
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr ""
+"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
 
-#: g10/g10.c:983
-#, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
 msgstr ""
+"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
 
-#: g10/g10.c:986
-#, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr ""
+"AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
 
-#: g10/g10.c:989
-#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr ""
+"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:993
-#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr ""
+"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr ""
+"AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1334
 #, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "s'ha creat el nou fitxer d'opcions �%s�\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "NOTA: no existeix el fitxer d'opcions predeterminat �%s�\n"
+msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: no existeix el fitxer d'opcions predeterminat �%s�\n"
+msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "fitxer d'opcions �%s�: %s\n"
+msgstr "fitxer d'opcions �%s�: %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "llegint opcions de �%s�\n"
+msgstr "s'estan llegint opcions de �%s�\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTA: %s no �s per a �s normal!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
+"la extensi� de xifrat �%s� no s'ha carregat per tindre permissos "
+"insegurs\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
-msgstr "%s no �s un joc de car�cters v�lid\n"
+msgstr "%s no �s un joc de car�cters v�lid\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr ""
+"no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: versi� de fitxer %d inv�lid\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "opcions d'exportaci� no v�lides\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: opcions d'importanci� no v�lides\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "armadura inv�lida"
+msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: versi� de fitxer %d inv�lid\n"
+msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "l'anell no �s v�lid"
+msgstr "opcions d'exportaci� no v�lides\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: opcions d'importanci� no v�lides\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "opcions d'importaci� no v�lides\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "opcions d'exportaci� no v�lides\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr ""
+msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
-msgstr "ALERTA: el programa podria crear un fitxer core!\n"
+msgstr "AV�S: el programa podria crear un fitxer core!\n"
 
-#: g10/g10.c:1692
+# FIXME: prefer�ncia? jm
+# Ho discut�rem en la llista, segur.  Deu ser als arxius.  ivb
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr ""
+msgstr "AV�S: %s t� prefer�ncia sobre %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTA: %s no �s per a �s normal!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s no �s perm�s amb %s!\n"
+msgstr "%s no �s perm�s amb %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s no t� sentit amb %s!\n"
+msgstr "%s no t� sentit amb %s!\n"
 
-#: g10/g10.c:1731
+# clares -> en clar?  ivb
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr ""
+msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr ""
+msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
+"heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
+"habilitat.\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr ""
-
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr ""
+msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
-msgstr "l'algoritme de xifratge triat no �s v�lid\n"
+msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
-msgstr "el algorime de digest seleccionat no �s v�lid\n"
+msgstr "l'algorisme de resum seleccionat no �s v�lid\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "el algorime de digest seleccionat no �s v�lid\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:1845
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr "l'algoritme de compressi� ha d'estar en l'interval %d..%d\n"
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
-msgstr "max-cert-depth ha d'estar entre el rang 1 a 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
+
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
+msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "mode S2K inv�lid; ha de ser 0, 1 o 3\n"
-
-#: g10/g10.c:1862
-#, fuzzy
-msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "mode S2K inv�lid; ha de ser 0, 1 o 3\n"
+msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n"
 
-#: g10/g10.c:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "llista les prefer�ncies"
+msgstr "les prefer�ncies per defecte s�n inv�lides\n"
 
-#: g10/g10.c:1876
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr ""
+msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "llista les prefer�ncies"
+msgstr "les prefer�ncies personals de digest s�n inv�lides\n"
 
-#: g10/g10.c:1884
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
+msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s encara no funciona amb %s\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
+"no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n"
+
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
-msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
+msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [nom_del_fitxer]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "no podeu usar %s mentre esteu en mode %s\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
 #, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [nom_del_fitxer]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "no podeu usar %s mentre esteu en mode %s\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
-msgstr "--symmetric [nom_del_fitxer]"
+msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2110
-#, fuzzy
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
-msgstr "--sign-key user-id"
+msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2118
-#, fuzzy
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
-msgstr "--lsign-key user-id"
+msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "l'enviament al servidor de claus ha fallat: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "l'exportaci� de la clau ha fallat: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "ha fallat la cerca al servidor de claus: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "ha fallat el refresc des del servidor de claus: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr ""
-"algoritme de hash inv�lid �%s�\n"
-"\n"
+msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "no s'ha pogut obrir �%s�\n"
+msgstr "no s'ha pogut obrir �%s�\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
-"el nom de la notaci� nom�s pot tenir lletres, d�gits, punts o subratllats i "
-"acabar amb el signe �=�\n"
+"un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i "
+"acabar amb el signe �=�\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n"
+
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
-msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
+msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
 
-#: g10/g10.c:2737
-#, fuzzy
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
-msgstr "la URL de pol�tica donada no �s v�lida\n"
+msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n"
 
-#: g10/g10.c:2739
-#, fuzzy
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
-msgstr "la URL de pol�tica donada no �s v�lida\n"
+msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
 
-#: g10/armor.c:314
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "una mica m�s silenci�s"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "pren les claus d'aquest anell"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "fes els conflictes de marques de temps nom�s un av�s"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|escriu informaci� d'estat en aquest FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Forma d'�s: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+# Werner FIXME: should it use �Usage�?
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sintaxi: gpg [opcions] [fitxers]\n"
+"Comprova signatures amb claus conegudes amb confian�a\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
-msgstr "cap�alera d'armadura no v�lida: "
+msgstr "la cap�alera d'armadura �s inv�lida: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
-msgstr "cap�alera d'armadura: "
+msgstr "cap�alera d'armadura: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
-msgstr "cap�alera de signatura clara inv�lida\n"
+msgstr "la cap�alera de signatura clara �s inv�lida\n"
 
-#: g10/armor.c:413
+# �s un missatge d'error?  ivb
+# �Anidada� �s un castellanisme.  Niuades?  Imbricades (SC)??  ivb
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
-msgstr "signatures en text pla anidades\n"
+msgstr "signatures en text pla imbricades\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
-msgstr "l�nia escapada amb gui� no v�lida: "
+msgstr "la l�nia escapada amb gui� �s inv�lida: "
 
-#: g10/armor.c:549
+# FIXME: un-indiar. jm
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "car�cter radix64 %02x inv�lid om�s\n"
+msgstr "el car�cter radix64 %02x inv�lid s'ha om�s\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
-msgstr "CRC mal format\n"
+msgstr "CRC malformat\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
-msgstr "f� de fitxer prematur (al final)\n"
+msgstr "f� de fitxer prematur (al final)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
-msgstr "error en la �ltima l�nia\n"
+msgstr "error en l'�ltima l�nia\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
-msgstr "no s'han trobat dades OpenPGP v�lides.\n"
+msgstr "no s'han trobat dades OpenPGP v�lides.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "armadura inv�lida: l�nia m�s llarga que %d car�cters\n"
+msgstr ""
+"l'armadura �s inv�lida: la l�nia �s m�s llarga que %d car�cters\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"car�cter �quoted printable� en l'armadura - probablement s'ha utilitzat un "
-"MTA amb errors\n"
+"hi ha un car�cter �quoted printable� en l'armadura - probablement s'ha "
+"utilitzat un MTA amb errors\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
-msgstr "No s'ha especificat cap ra�"
+msgstr "No s'ha especificat cap ra�"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
-msgstr "La clau ha estat substitu�da"
+msgstr "La clau ha estat substitu�da"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
-msgstr "La ID d'usuari ja no �s v�lid"
+msgstr "L'ID d'usuari ja no �s v�lid"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "Ra� de la revocaci�: "
+msgstr "ra� de la revocaci�: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Comentari: "
+msgstr "comentari de la revocaci�: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
-msgstr ""
+msgstr "iImMxXoO"
 
-#: g10/pkclist.c:258
-#, fuzzy, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
-"No hi ha cap valor de confian�a assignat a %lu:\n"
+"No hi ha cap valor de confian�a assignat a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
 #, fuzzy
+msgid "          \""
+msgstr "              alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "              alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
 "checking fingerprints from different sources...)?\n"
 "\n"
 msgstr ""
-"Fins a quin punt confieu en aquest usuari per a verificar\n"
-"les claus d'altres usuaris (mirant passaports,\n"
+"Decidiu fins a quin punt confieu en aquest usuari per a\n"
+"verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
-"\n"
-" 1 = No ho s�\n"
-" 2 = No hi confie\n"
-" 3 = Hi confie poc\n"
-" 4 = Hi confie completament\n"
-" s = mostra m�s informaci�\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
-msgstr ""
-
-#: g10/pkclist.c:274
+#: g10/pkclist.c:250
 #, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = No ho s�\n"
+
+#: g10/pkclist.c:252
+#, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%08lX: La clau no �s de confian�a\n"
+msgstr " %d = NO confie\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr ""
+msgstr " %d = Hi confie marginalment\n"
 
-#: g10/pkclist.c:276
-#, fuzzy, c-format
+#: g10/pkclist.c:256
+#, c-format
 msgid " %d = I trust fully\n"
-msgstr "%s no �s un fitxer de base de dades de confian�a\n"
+msgstr " %d = Hi confie plenament\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr ""
+msgstr " %d = Hi confie absolutament\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
-msgstr ""
+msgstr " i = mostra m�s informaci�\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
-msgstr " m = torna al men� principal\n"
+msgstr " m = torna al men� principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
-msgstr ""
+msgstr " o = omet aquesta clau\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
-msgstr " q = ix\n"
+msgstr " x = ix\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
-msgstr "La vostra decisi�? "
+msgstr "La vostra decisi�? "
 
-#: g10/pkclist.c:316
-#, fuzzy
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Realment voleu eliminar aquesta clau? "
+msgstr "Realment voleu assignar confian�a absoluta a aquesta clau? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Certificats que duen a una clau de confian�a absoluta:\n"
+msgstr "Certificats que duen a una clau de confian�a absoluta:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clau %08lX: aquesta clau ha estat revocada!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "clau %08lX: aquesta subclau ha estat revocada!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: la clau ha caducat\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:430
 #, fuzzy, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"    No hi ha res que indique que la signatura pertany al seu propietari.\n"
+"%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
-msgstr "%08lX: La clau no �s de confian�a\n"
+msgstr "%08lX: La clau NO �s de confian�a\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: No hi ha garanties que aquesta clau pertanga realment al seu\n"
-"propietari per� s'accepta de tota manera\n"
+"%08lX: No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Aquesta clau pertany probablement al seu propietari\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
-msgstr "Aquesta clau �s nostra\n"
+msgstr "Aquesta clau �s nostra\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"No �s segur que la clau pertanga al seu propietari.\n"
-"Si realment sabeu qu� feu, podeu respondre\n"
-"que s� a la seg�ent pregunta\n"
+"NO �s segur que la clau pertanya a la persona esmentada en\n"
+"l'ID d'usuari. Si *realment* sabeu qu� feu, podeu respondre\n"
+"�s�� a la seg�ent pregunta\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
-msgstr "ALERTA: �s una clau no fiable!\n"
+msgstr "AV�S: S'est� usant una clau no fiable!\n"
+
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no "
+"est� present.\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "ALERTA: Aquesta clau ha estat revocada pel propietari!\n"
+msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
-msgstr " A�� podria significar que la signatura �s falsificada.\n"
+msgstr "      A�� podria significar que la signatura �s falsificada.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "ALERTA: Aquesta subclau ha estat revocada pel propietari!\n"
+msgstr "AV�S: Aquesta subclau ha estat revocada pel propietari!\n"
 
-#: g10/pkclist.c:580
-#, fuzzy
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
-msgstr "Aquesta clau ha estat desactivada"
+msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "ALERTA: Aquesta clau no ve certificada per una firma de confian�a!\n"
+msgstr ""
+"AV�S: Aquesta clau no ve certificada per una signatura de confian�a!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "ALERTA: La clau no �s de confian�a!\n"
+msgstr "AV�S: La clau NO �s de confian�a!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "          Probablement la signatura �s falsa.\n"
+msgstr "          Probablement la signatura �s FALSA.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "ALERTA: Aquesta clau no ve certificada per signatures prou fiables!\n"
+msgstr "AV�S: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "No �s segur que la signatura pertanga al seu propietari.\n"
+msgstr "No �s segur que la signatura pertanya al seu propietari.\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
-msgstr "%s: ignorat: %s\n"
+msgstr "%s: es descarta: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: ignorat: clau p�blica ja present\n"
+msgstr "%s: es descarta: la clau p�blica ja est� present\n"
 
-#: g10/pkclist.c:811
-#, fuzzy
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "No heu especificat usuari. (Podeu usar �-r�)\n"
+msgstr "No heu especificat un ID d'usuari. (podeu usar �-r�)\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
 
-#: g10/pkclist.c:824
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
+"\n"
+"Introdu�u l'ID d'usuari. Finalitzeu amb una l�nia en blanc: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
-msgstr "ignorat: la clau p�blica ja s'ha especificat com a destinatari\n"
+msgstr "es descarta: la clau p�blica ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
-msgstr "La clau p�blica est� desactivada.\n"
+msgstr "La clau p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:870
-#, fuzzy
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
-msgstr "%s: ignorat: clau p�blica ja present\n"
+msgstr "es descarta: la clau p�blica ja est� establida\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
-msgstr "destinatari predeterminat desconegut �%s�\n"
+msgstr "el destinatari predeterminat �s desconegut �%s�\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: ignorat: la clau p�blica est� desactivada\n"
+msgstr "%s: es descarta: la clau p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
-msgstr "no hi ha adreces v�lides\n"
+msgstr "no hi ha adreces v�lides\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr ""
-
-#: g10/keygen.c:189
+#: g10/keygen.c:207
 #, fuzzy, c-format
-msgid "preference %c%lu duplicated\n"
-msgstr "�%s� ignorat: duplicat\n"
+msgid "preference `%s' duplicated\n"
+msgstr "la prefer�ncia %c%lu �s duplicada\n"
 
-#: g10/keygen.c:194
-#, fuzzy, c-format
-msgid "too many `%c' preferences\n"
-msgstr "llista les prefer�ncies"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "hi ha massa prefer�ncies �%c�\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:216
 #, fuzzy
-msgid "invalid character in preference string\n"
-msgstr "Car�cter inv�lid en el camp *nom*\n"
+msgid "too many digest preferences\n"
+msgstr "hi ha massa prefer�ncies �%c�\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "hi ha massa prefer�ncies �%c�\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "escriptura de l'autosignatura\n"
+msgstr "s'est� escrivint una signatura directa\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
-msgstr "escriptura de l'autosignatura\n"
+msgstr "s'est� escrivint l'autosignatura\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
-msgstr "escriptura de la signatura de comprovaci� de la clau\n"
+msgstr "s'est� escrivint la signatura de comprovaci� de la clau\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "grand�ria de la clau inv�lida; s'hi usaran %u bits\n"
+msgstr "la mida de la clau �s inv�lida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "grand�ria de la clau arrodonida fins a %u bits\n"
+msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
-msgstr "Trieu quin tipus de clau voleu:\n"
+msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (nom�s signar)\n"
+msgstr "   (%d) DSA (nom�s signar)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (nom�s xifrar)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (nom�s xifrar)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:1171
 #, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (signar i xifrar)\n"
-
-#: g10/keygen.c:949
-#, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) DSA (nom�s signar)\n"
+msgstr "   (%d) RSA (nom�s signar)\n"
 
-#: g10/keygen.c:951
-#, fuzzy, c-format
+#: g10/keygen.c:1173
+#, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) ElGamal (nom�s xifrar)\n"
+msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signar i xifrar)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
-msgstr "Trieu: "
-
-#: g10/keygen.c:966 g10/keygen.c:984
-msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr "L'us d'aquest algoritme est� desaconsellat - crear igualment? "
+msgstr "Seleccioneu: "
 
-#: g10/keyedit.c:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
-msgstr "Selecci� inv�lida.\n"
+msgstr "La selecci� �s inv�lida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1582,70 +1715,65 @@ msgid ""
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 "Preparat per a generar un nou parell de claus %s.\n"
-"              grand�ria m�nima:  768 bits\n"
-"      grand�ria predeterminada: 1024 bits\n"
-"  grand�ria m�xima aconsellada: 2048 bits\n"
+"              grand�ria m�nima:  768 bits\n"
+"      grand�ria predeterminada: 1024 bits\n"
+"  grand�ria m�xima aconsellada: 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
-msgstr "Quina grand�ria voleu? (1024) "
+msgstr "Quina grand�ria voleu? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA nom�s permet clau entre 512 i 1024 bits\n"
+msgstr "DSA nom�s permet claus entre 512 i 1024 bits\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "calu massa petita; 1024 bits �s el m�nim perm�s per a claus RSA.\n"
+msgstr ""
+"la clau �s massa petita; 1024 bits ?s el m�nim perm�s per a claus "
+"RSA.\n"
 
-#: g10/keygen.c:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "clau massa petita; 768 bits �s el m�nim perm�s.\n"
-
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+msgstr "la clau �s massa petita; 768 bits �s el m�nim perm�s.\n"
+
+# Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons.  ivb
+#: g10/keygen.c:1255
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "clau massa llarga; %d �s el m�xim perm�s.\n"
+msgstr "la clau �s massa llarga; %d �s el m�xim perm�s.\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
-"No es recomanen claus m�s llargues de 2048 bits perqu�\n"
-"els c�lculs s�n VERITABLEMENT llargs!\n"
+"No es recomanen claus m�s llargues de 2048 bits perqu�\n"
+"els c�lculs s�n VERITABLEMENT llargs!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
-msgstr "Segur que voleu aquesta grand�ria? "
+msgstr "Segur que voleu aquesta grand�ria? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
-"D'acord, per� sapigueu que la radiaci� del monitor i del teclat tamb� son "
-"molt vulnerables als atacs!\n"
+"D'acord, per� sapieu que la radiaci� del monitor i del teclat tamb� "
+"son molt vulnerables als atacs!\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "La grand�ria sol�licitada �s %u bits\n"
+msgstr "La grand�ria sol�licitada �s %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1655,14 +1783,13 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 "Especifiqueu el temps de validesa de la clau.\n"
-"         0 = no caduca\n"
-"      <n>  = caduca als n dies\n"
-"      <n>w = caduca a les n setmanes\n"
-"      <n>m = caduca als n mesos\n"
-"      <n>y = caduca als n anys\n"
+"         0 = la clau no caduca\n"
+"      <n>  = la clau caduca als n dies\n"
+"      <n>w = la clau caduca a les n setmanes\n"
+"      <n>m = la clau caduca als n mesos\n"
+"      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1126
-#, fuzzy
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1671,50 +1798,50 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"Especifiqueu el temps de validesa de la clau.\n"
-"         0 = no caduca\n"
-"      <n>  = caduca als n dies\n"
-"      <n>w = caduca a les n setmanes\n"
-"      <n>m = caduca als n mesos\n"
-"      <n>y = caduca als n anys\n"
+"Especifiqueu el temps de validesa de la signatura.\n"
+"         0 = la signatura no caduca\n"
+"      <n>  = la signatura caduca als n dies\n"
+"      <n>w = la signatura caduca a les n setmanes\n"
+"      <n>m = la signatura caduca als n mesos\n"
+"      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1150
-#, fuzzy
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
-msgstr "Indiqueu la validesa de la clau (0) "
+msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
-msgstr "valor inv�lid\n"
+msgstr "el valor no �s v�lid\n"
 
-#: g10/keygen.c:1160
-#, fuzzy, c-format
+#: g10/keygen.c:1374
+#, c-format
 msgid "%s does not expire at all\n"
-msgstr "La clau no caduca\n"
+msgstr "%s no caduca en absolut\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
-#, fuzzy, c-format
+#: g10/keygen.c:1381
+#, c-format
 msgid "%s expires at %s\n"
-msgstr "La clau caduca el %s\n"
+msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1173
+# Amb �it� es refereix a les dates?  ivb
+# Aix� vaig entendre jo. jm
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
-"Tanmateix, les manejar� b� fins l'any 2106.\n"
+"Tanmateix, les tractar� b� fins l'any 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
-msgstr "�s correcte? (s/n)"
+msgstr "�s correcte? (s/n)"
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1725,190 +1852,204 @@ msgid ""
 msgstr ""
 "\n"
 "Necessiteu un ID d'usuari per a identificar la vostra clau; el programa\n"
-"construeix la id de l'usuari amb el Nom, Comentari i Adre�a electr�nica\n"
+"construeix l'id de l'usuari amb el Nom, Comentari i Adre�a electr�nica\n"
 "d'aquesta forma:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
-msgstr "Nom i cognoms"
+msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
-msgstr "Car�cter inv�lid en el camp *nom*\n"
+msgstr "Hi ha un car�cter inv�lid en el camp *nom*\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
-msgstr "El nom no pot comen�ar amb un d�git\n"
+msgstr "El nom no pot comen�ar amb un d�git\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
-msgstr "El nom ha de tenir, si m�s no, 5 car�cters\n"
+msgstr "El nom ha de tenir, si m�s no, 5 car�cters\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
-msgstr "Adre�a electr�nica: "
+msgstr "Adre�a electr�nica: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
-msgstr "No �s una adre�a v�lida\n"
+msgstr "No �s una adre�a v�lida\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
-msgstr "Car�cter inv�lid en el camp *comentari*\n"
+msgstr "Hi ha un car�cter inv�lid en el camp *comentari*\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "Esteu usant el joc de car�cters `%s'.\n"
+msgstr "Esteu usant el joc de car�cters `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"Heu triat l'usuari:\n"
+"Heu triat l'identificador d'usuari:\n"
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "No inclogueu l'adre�a ni en el camp *nom* ni en el camp *comentari*\n"
+msgstr ""
+"No inclogueu l'adre�a ni en el camp *nom* ni en el camp *comentari*\n"
 
-#: g10/keygen.c:1316
+# xX? ivb
+# Hmm... s�. jm
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
-msgstr "NnCcEeOoQq"
+msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "Canvia (N)om, (C)omentari, (E)mail o (Q) ix "
+msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1542
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (Q) ix"
+msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"Cal una contrasenya per a protegir la clau privada.\n"
+"Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
-#, fuzzy
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
-msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho\n"
+msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
-msgstr ""
+msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"No voleu contrasenya: �s una mala idea!\n"
-"B�. Si voleu canviar-la m�s endavant,\n"
-"useu aquest programa amb l'opci� \"--edit-key\".\n"
+"No voleu contrasenya: �s una mala idea!\n"
+"B�. Si voleu canviar-la m�s endavant,\n"
+"useu aquest programa amb l'opci� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"Cal generar molts bits aleatoriament. �s bona idea fer alguna altra cosa\n"
-"(teclejar, moure el ratol�, usar els discos) durant la generaci� de\n"
-"nombres primers; a�� d�na oportunitat al generador de nombres aleatoris\n"
+"Cal generar molts bits aleat?riament. �s bona idea fer alguna altra cosa\n"
+"(teclejar, moure el ratol�, usar els discos) durant la generaci� de\n"
+"nombres primers; a�� d�na oportunitat al generador de nombres "
+"aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "no es pot fet aix� en mode desat�s\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
-msgstr "Generaci� de claus cancel�lada.\n"
+msgstr "La generaci� de claus ha estat cancel�lada.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
-msgstr "escriptura de la clau p�blica a `%s'\n"
+msgstr "s'est� escrivint la clau p�blica a �%s�\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "escriptura de la clau privada a `%s'\n"
+msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/keygen.c:2205
-#, fuzzy, c-format
+# Potser no hi haja cap anell! ivb
+#: g10/keygen.c:2565
+#, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n"
+msgstr "no s'ha trobat cap anell p�blic escrivible: %s\n"
 
-#: g10/keygen.c:2211
-#, fuzzy, c-format
+#: g10/keygen.c:2571
+#, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "clau %08lX: no s'ha trobat la clau privada: %s\n"
+msgstr ""
+"no s'ha trobat cap anell secret de escrivible: %s\n"
+"\n"
 
-#: g10/keygen.c:2225
-#, fuzzy, c-format
+#: g10/keygen.c:2589
+#, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
+msgstr ""
+"s'ha produ�t un error mentre s'escrivia l'anell p�blic �%s�: %s\n"
 
-#: g10/keygen.c:2232
-#, fuzzy, c-format
+#: g10/keygen.c:2596
+#, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
+msgstr ""
+"s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
-msgstr "claus p�blica i privada creades i signades.\n"
-
-#: g10/keygen.c:2253
-#, fuzzy
-msgid "key marked as ultimately trusted.\n"
-msgstr "Certificats que duen a una clau de confian�a absoluta:\n"
+msgstr "s'han creat i signat les claus p�blica i secreta.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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 ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
-"\"--edit-key\" per a generar una clau secund�ria per a tal prop�sit.\n"
+"\"--edit-key\" per a generar una clau secund�ria per a tal prop�sit.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "La generaci� de claus ha fallat: %s\n"
+msgstr "La generaci� de claus ha fallat: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+# Werner FIXME: Use ngettext. jm
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
-"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
+"la clau s'ha creat %lu segon en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+# Werner FIXME: use ngettext. jm
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1916,2217 +2057,2742 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "NOTA: crear subclaus per a claus v3 no �s conformant amb OpenPGP\n"
+msgstr "NOTA: crear subclaus per a claus v3 no �s conforme amb OpenPGP\n"
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Crear realment? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
-msgstr ""
+msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no s'ha pogut obrir: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "error en la creaci� de la contrasenya: %s\n"
+msgstr "error en la creaci� de la contrasenya: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "no es pot usar un paquet asim�tric ESK al estar en mode S2K\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
 #, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "Ha fallat el proc�s de signatura: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
 msgid "`%s' already compressed\n"
-msgstr "%lu claus processades\n"
+msgstr "�%s� ja est� comprimida\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
-msgstr "%s: ALERTA: fitxer buit\n"
+msgstr "%s: AV�S: el fitxer �s buit\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
+"nom�s podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
 
-#: g10/encode.c:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
-msgstr "llegint des de �%s�\n"
+msgstr "s'est� llegint des de �%s�\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
+"no s'ha pogut utilitzar el xifratge IDEA per a totes les claus per a les que "
+"esteu xifrant.\n"
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del "
+"destinatari\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
-msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n"
-
-#: g10/encode.c:703
+#: g10/encode.c:634 g10/sign.c:863
 #, c-format
-msgid "you may not use %s while in %s mode\n"
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
+"for�ar l'algoritme de compressi� %s (%d) viola les prefer�ncies del "
+"destinatari\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s xifrat per a: %s\n"
+msgstr "%s/%s xifrat per a: �%s�\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
-#, fuzzy, c-format
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "no s'ha trobat l'usuari �%s�: %s\n"
+msgstr "no s'ha trobat la clau �%s�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
-#, fuzzy, c-format
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "error en la lectura de �%s�: %s\n"
+msgstr "s'ha produ�t un error en llegir el bloc de claus: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "clau %08lX: no �s una clau rfc2440 - ignorada\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "clau %08lX: no est� protegida - es descarta\n"
 
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
-msgstr "clau %08lX: no protegida - ignorada\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:246
+#: g10/export.c:353
 #, fuzzy, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "clau %08lX: clau nova: s'ignorar�\n"
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+"AV�S: la clau secreta %08lX no te una simple suma de comprovaci� SK\n"
 
-#: g10/export.c:347
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
-msgstr "ALERTA: no s'hi ha exportat res\n"
+msgstr "AV�S: no s'ha exportat res\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
-msgstr "massa entrades en la mem�ria cau de claus p�bliques - desactivada\n"
+msgstr ""
+"hi ha massa entrades en la mem�ria cau de claus p�bliques - 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
-msgstr "[No s'ha trobat l'usuari]"
+msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
+"La clau inv�lida %08lX s'ha fet v�lida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
-msgstr "s'usar� la clau secund�ria %08lX en lloc de la prim�ria %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+"no hi ha una clau secreta per a la subclau p�blica %08lX - es descarta\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "clau %08lX: clau secreta sense clau p�blica: ignorada\n"
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "s'usar� la clau secund�ria %08lX en lloc de la prim�ria %08lX\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "clau %08lX: clau secreta sense clau p�blica - es descarta\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "bloc de tipus %d ignorat\n"
+msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "error en la lectura de �%s�: %s\n"
+msgstr "error en la lectura de �%s�: %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr " claus noves ignorades: %lu\n"
+msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "              sense ID: %lu\n"
+msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
-msgstr "            importades: %lu"
+msgstr "              importades: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "        no modificades: %lu\n"
+msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "    IDs d'usuaris nous: %lu\n"
+msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "        subclaus noves: %lu\n"
+msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "      signatures noves: %lu\n"
+msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "     noves revocacions: %lu\n"
+msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "claus privades llegides: %lu\n"
+msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "            importades: %lu"
+msgstr "              importades: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "clau %08lX: sense ID\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
 
-#: g10/import.c:597
-#, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Heu signat els seg�ents ID d'usuari:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:588
 #, fuzzy, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "clau %08lX: s'ha acceptat la ID d'usuari no auto-signada '"
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
-msgstr "clau %08lX: l'ID no �s v�lid\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:621
-msgid "this may be caused by a missing self-signature\n"
-msgstr "a�� pot ser causat per l'abs�ncia d'autofirma\n"
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
-msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n"
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
 
-#: g10/import.c:636
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: new key - skipped\n"
-msgstr "clau %08lX: clau nova: s'ignorar�\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:646
+#: g10/import.c:707
 #, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "clau %08lX: corrupci� de la subclau HKP reparada\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada �%s�\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "clau %08lX: l'ID no �s v�lid\n"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "a�� pot ser causat per l'abs�ncia d'autosignatura\n"
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "clau %08lX: clau nova - es descarta \n"
+
+#: g10/import.c:755
+#, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
+msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "escriptura a �%s�\n"
+msgstr "s'est� escrivint en �%s�\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
+msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "clau %08lX: clau p�blica importada\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "clau %08lX: s'ha importat la clau p�blica �%s�\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
-msgstr "clau %08lX: no correspon a la nostra c�pia\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "clau %08lX: no correspon a la nostra c�pia\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "clau %08lX: 1 ID d'usuari nou\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "clau %08lX: �%s� 1 ID d'usuari nou\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "clau %08lX: %d ID nous\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "clau %08lX: �%s� %d ID d'usuari nous\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "clau %08lX: 1 signatura nova\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "clau %08lX: �%s� 1 signatura nova\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "clau %08lX: %d signatures noves\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "clau %08lX: �%s� %d signatures noves\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "clau %08lX: 1 subclau nova\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "clau %08lX: �%s� 1 subclau nova\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "clau %08lX: %d subclaus noves\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "clau %08lX: �%s� %d subclaus noves\n"
 
-#: g10/import.c:774
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "clau %08lX: no modificada\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "clau %08lX: �%s� no ha estat modificada\n"
 
-#: g10/import.c:844
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "no default secret keyring: %s\n"
-msgstr "no hi ha anell p�blic predeterminat\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "clau %08lX: clau secreta amb xifrat %d no v�lid - es descarta\n"
 
-#: g10/import.c:855
+#: g10/import.c:1064
 #, c-format
-msgid "key %08lX: secret key imported\n"
-msgstr "clau %08lX: clau privada importada\n"
+msgid "no default secret keyring: %s\n"
+msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "clau %08lX: s'ha importat la clau secreta\n"
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
-msgstr "clau %08lX: no s'ha trobat la clau privada: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"clau %08lX: falta la clau p�blica: no es pot aplicar el certificat\n"
-"de revocaci�\n"
+"clau %08lX: falta la clau p�blica: no es pot aplicar el certificat\n"
+"de revocaci�\n"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "clau %08lX: certificat de revocaci� inv�lid: %s: rebutjat\n"
+# O �rebutjara�? ivb
+# Per tots els canvis d'anglicisme �ignorat� -> �es descarta�,
+# �es rebutja� est� b�. jm
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr ""
+"clau %08lX: el certificat de revocaci� �s inv�lid: %s: es rebutja\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "clau %08lX: certificat de revocaci� importat\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "clau %08lX: s'ha importat el certificat de revocaci� �%s�\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1030
+#: g10/import.c:1299
 #, fuzzy, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "clau %08lX: algoritme de clau p�blica no suportat\n"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr ""
+"clau %08lX: l'algoritme de clau p�blica no es suporta sobre l'id d'usuari "
+"�%s�\n"
+"\n"
 
-#: g10/import.c:1032
+#: g10/import.c:1301
 #, fuzzy, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "clau %08lX: autofirma no v�lida\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr ""
+"clau %08lX: l'autosignatura no �s v�lida en l'id d'usuari �%s�\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
-msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
-msgstr "clau %08lX: algoritme de clau p�blica no suportat\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "clau %08lX: l'algoritme de clau p�blica no �s suportat\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr "clau %08lX: enlla� de subclau inv�lid\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "clau %08lX: l'enlla� de subclau �s inv�lid\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "clau %08lX: enlla� de subclau inv�lid\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "clau %08lX: s'ha eliminat un enlla� de subclau m�ltiple\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "clau %08lX: no hi ha una subclau per a la clau de revocaci�\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "clau %08lX.%lu: Subclau de revocaci� v�lida\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "clau %08lX: Subclau de revocaci� no v�lida\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "clau %08lX: enlla� de subclau inv�lid\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "clau %08lX: s'han eliminat subclaus de revocaci� m�ltiples\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
-msgstr "clau %08lX: ID ignorat '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
-msgstr "clau %08lX: subclau ignorada\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "clau %08lX: es descarta la subclau\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr "clau %08lX: signatura inexportable (classe %02x) - ignorada\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr ""
+"clau %08lX: la signatura �s inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "clau %08lX: certificat de revocaci� en el lloc equivocat - ignorat\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr ""
+"clau %08lX: el certificat de revocaci� �s en el lloc equivocat - es "
+"descarta\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "clau %08lX: certificat de revocaci� no v�lid: %s - ignorat\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr ""
+"clau %08lX: el certificat de revocaci� �s inv�lid: %s - es descarta\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "clau %08lX: certificat de revocaci� en el lloc equivocat - ignorat\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr ""
+"clau %08lX: la signatura de la subclau �s en el lloc equivocat - es "
+"descarta\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr "clau %08lX: detectat ID duplicat - fusionat\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr ""
+"clau %08lX: la classe de signatura �s inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
+"AV�S: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci� "
+"%08lX\n"
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
+"AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no "
+"est� present.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci�\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci� �%s�\n"
 
-#: g10/import.c:1491
+#: g10/import.c:1804
 #, fuzzy, c-format
-msgid "key %08lX: direct key signature added\n"
-msgstr "clau %08lX: %d signatures noves\n"
+msgid "key %s: direct key signature added\n"
+msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
-msgstr "[revocaci�]"
+msgstr "[revocaci�]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
-msgstr "1 signatura err�nia\n"
+msgstr "1 signatura err�nia\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "%d signatures err�nies\n"
+msgstr "%d signatures err�nies\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures no comprovades per falta de clau\n"
 
-#: g10/keyedit.c:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "Ha estat detectat 1 ID sense autosignatura v�lida\n"
+msgstr "Ha estat detectat 1 ID sense autosignatura v�lida\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "Han estat detectats %d IDs sense autosignatura v�lida\n"
+msgstr "Han estat detectats %d IDs sense autosignatura v�lida\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Hi confie marginalment\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr ""
+msgstr "L'ID d'usuari �%s� est� revocat."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
-#, fuzzy
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Segur que voleu aquesta grand�ria? "
+msgstr "Segur que encara voleu signarla? (s/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+# O no s'ha pogut? ivb
+# FIXME: comprovar context. jm
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
-msgstr ""
+msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "ALERTA: �%s� �s un fitxer buit\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "L'ID d'usuari �%s� ha caducat."
+
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "L'ID d'usuari �%s� no est� autosignat."
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
+"La vostra signatura en �%s�\n"
+"�s una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
 msgstr ""
+"La vostra signatura actual en �%s�\n"
+"ha caducat.\n"
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Voleu crear una nova signatura per a reempla�ar la caducada? (s/N) "
+
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
+"La vostra signatura en �%s�\n"
+"�s una signatura local.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr ""
+msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:657
 #, fuzzy, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "Ja est� signat amb la clau %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "�%s� ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:660
 #, fuzzy, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "Ja est� signat amb la clau %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "�%s� ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
-msgstr "No hi ha res que signat amb la clau %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:478
-#, fuzzy
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "No hi ha res que signar amb la clau %08lX\n"
+
+#: g10/keyedit.c:702
 msgid "This key has expired!"
-msgstr "Nota: La clau ha caducat!\n"
+msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:498
-#, fuzzy, c-format
+#: g10/keyedit.c:722
+#, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Aquesta clau no est� protegida.\n"
+msgstr "Aquesta clau caducar� el %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr ""
+msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
+"No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr ""
+msgstr "A�� inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 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 ""
+"Amb quanta cura heu verificat que la clau que esteu a punt de signar \n"
+"pertany realment a la persona esmentada anteriorment? Si no sabeu qu� \n"
+"contestar, entreu �0�.\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr ""
+msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr ""
+msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr ""
+msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) He fet comprovacions molt acurades.%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
 msgstr ""
+"Seleccioneu una opci� (introdu�u �?� per obtindre m�s "
+"informaci�):"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
-"Esteu segurs que voleu signar aquesta clau\n"
+"Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "a�� pot ser causat per l'abs�ncia d'autofirma\n"
+msgstr ""
+"\n"
+"A�� ser� una autosignatura.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
-"La signatura es marcar� com a inexportable.\n"
 "\n"
+"AV�S: la signatura no es marcar� com a inexportable.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
-"La signatura es marcar� com a inexportable.\n"
 "\n"
+"AV�S: la signatura no es marcar� com a irrevocable.\n"
 
-#: g10/keyedit.c:620
-#, fuzzy
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
-"La signatura es marcar� com a inexportable.\n"
 "\n"
+"La signatura es marcar� com a inexportable.\n"
 
-#: g10/keyedit.c:624
-#, fuzzy
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
-"La signatura es marcar� com a inexportable.\n"
 "\n"
+"La signatura es marcar� com a irrevocable.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
+"\n"
+"No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
+"\n"
+"He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
+"\n"
+"He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "Ha fallat el proc�s de signatura: %s\n"
+msgstr "Ha fallat el proc�s de signatura: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
-msgstr "Aquesta clau no est� protegida.\n"
+msgstr "Aquesta clau no est� protegida.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
-msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n"
+msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
-msgstr "La clau est� protegida.\n"
+msgstr "La clau est� protegida.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Introdu�u la nova contrasenya per a la clau secreta.\n"
+"Introdu�u la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"No voleu contrasenya: a�� �s probablement una *mala* idea!\n"
+"No voleu contrasenya: a�� �s probablement una *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:795
+# No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
-msgstr "N'esteu segur de voler fer a��? "
+msgstr "Esteu segur de voler fer a��? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
-msgstr "posant la signatura al lloc correcte\n"
+msgstr "s'est� posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
-msgstr "eixit del men�"
+msgstr "ix del men�"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "desa"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "ajuda"
 
-#: g10/keyedit.c:904
+# �pantalla� o �ajuda�?  ivb
+# �ajuda�, evidentment. jm
+#: g10/keyedit.c:1141
 msgid "show this help"
-msgstr "mostrar aquesta pantalla"
+msgstr "mostra aquesta ajuda"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "llista"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+# Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
+# Yeah, els vaig corregir abans de que enviares la teua correcci�. jm
+#: g10/keyedit.c:1146
 msgid "select user ID N"
-msgstr "triar ID N"
+msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "clau"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
-msgstr "tria clau secund�ria N"
+msgstr "tria la clau secund�ria N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
-msgstr "comprovar"
+msgstr "comprova"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
-msgstr "llista signatures"
+msgstr "llista les signatures"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "signa la clau"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "crea una signatura separada"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
-msgstr "signar la clau localment"
+msgstr "signa la clau localment"
 
-#: g10/keyedit.c:916
-#, fuzzy
+#: g10/keyedit.c:1154
 msgid "nrsign"
-msgstr "sign"
+msgstr "nrsign"
 
-#: g10/keyedit.c:916
-#, fuzzy
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
-msgstr "signar la clau localment"
+msgstr "signa la clau irrevocablement"
 
-#: g10/keyedit.c:917
-#, fuzzy
+#: g10/keyedit.c:1155
 msgid "nrlsign"
-msgstr "lsign"
+msgstr "nrlsign"
 
-#: g10/keyedit.c:917
-#, fuzzy
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
-msgstr "signar la clau localment"
+msgstr "signa la clau localment i irrevocablement"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
-msgstr "afegir ID d'usuari"
+msgstr "afegeix un ID d'usuari"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
-msgstr ""
+msgstr "addphoto"
 
-#: g10/keyedit.c:920
-#, fuzzy
+# Com estava escrit abans.  ivb
+# Si et refereixes a Photo vs. photo, ho deixe en min�scules, que en tot
+# el men� est� tot en min�scules. Tb hi ha molts ID vs. id en els msgids
+# i no hem unificat en catal�. Potser li ho dir� a Werner. jm.
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
-msgstr "afegir ID d'usuari"
+msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
-msgstr "esborrar ID d'usuari"
+msgstr "esborra un ID d'usuari"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
-msgstr ""
+msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
-msgstr "afegir una clau secund�ria"
+msgstr "afegeix una clau secund�ria"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
-msgstr "esborrar una clau secund�ria"
+msgstr "esborra una clau secund�ria"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "revocada"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "afegir una clau secund�ria"
+msgstr "afegeix una clau de revocaci�"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
-msgstr "esborrar signatures"
+msgstr "esborra signatures"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
-msgstr "canviar la data de caducitat"
+msgstr "canvia la data de caducitat"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
-msgstr ""
+msgstr "primari"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
-msgstr ""
+msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
-msgstr "canvia entre el llistat de claus secretes i p�bliques"
+msgstr "canvia entre el llistat de claus secretes i p�bliques"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
-#, fuzzy
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
-msgstr "llista les prefer�ncies"
+msgstr "llista les prefer�ncies (expert)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
-#, fuzzy
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
-msgstr "llista les prefer�ncies"
+msgstr "llista les prefer�ncies (detallat)"
 
-#: g10/keyedit.c:935
-#, fuzzy
+#: g10/keyedit.c:1173
 msgid "setpref"
-msgstr "pref"
+msgstr "setpref"
 
-#: g10/keyedit.c:935
-#, fuzzy
+#: g10/keyedit.c:1173
 msgid "set preference list"
-msgstr "llista les prefer�ncies"
+msgstr "estableix la llista de prefer�ncies"
 
-#: g10/keyedit.c:936
-#, fuzzy
+#: g10/keyedit.c:1174
 msgid "updpref"
-msgstr "pref"
+msgstr "updpref"
 
-#: g10/keyedit.c:936
-#, fuzzy
+#: g10/keyedit.c:1174
 msgid "updated preferences"
-msgstr "llista les prefer�ncies"
+msgstr "prefer�ncies actualitzades"
+
+# �del servidor�, �en el servidor�?  ivb
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "error de servidor de claus"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr ""
+"no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
-msgstr "canvia la confian�a"
+msgstr "canvia la confian�a"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "revoca un ID d'usuari"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
-msgstr "revoca una clau secund�ria"
+msgstr "revoca una clau secund�ria"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
-msgstr "desactivar clau"
+msgstr "desactiva una clau"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
-msgstr ""
+msgstr "showphoto"
 
-#: g10/keyedit.c:943
+# Igual que dalt.  ivb
+# Idem :) jm
+#: g10/keyedit.c:1183
 msgid "show photo ID"
-msgstr ""
+msgstr "mostra el photo ID"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+# Dest�s? ivb
+# Desat�s, s�. jm
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
-msgstr "no es pot fet aix� en mode batch\n"
+msgstr "no es pot fet aix� en mode desat�s\n"
 
-#: g10/keyedit.c:1000
-#, fuzzy, c-format
+#: g10/keyedit.c:1233
+#, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "error en la lectura de �%s�: %s\n"
+msgstr "error en llegir el bloc de claus secretes �%s�: %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
-msgstr "La clau secreta est� disponible.\n"
+msgstr "La clau secreta est� disponible.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
-msgstr "Ordre>"
+msgstr "Ordre> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
-msgstr "Cal la clau secreta per a fer a��.\n"
+msgstr "Cal la clau secreta per a fer a��.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
-msgstr "Useu l'ordre �toggle� abans.\n"
+msgstr "Useu l'ordre �toggle� abans.\n"
 
-#: g10/keyedit.c:1134
-#, fuzzy
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
-msgstr "La clau est� protegida.\n"
+msgstr "La clau est� revocada."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
-msgstr "Signar tots els IDs? "
+msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "Pista: Trieu els IDs que voleu signar\n"
+msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr ""
+msgstr "Aquesta ordre no est� permesa mentre s'est� en mode %s.\n"
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
-msgstr "Heu de seleccionar al menys un ID.\n"
+msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
-msgstr "No podeu esborrar l'�ltim ID!\n"
+msgstr "No podeu esborrar l'�ltim ID d'usuari!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
-msgstr "Eliminar tots els IDs seleccionats? "
+msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
-msgstr "Eliminar aquest ID? "
+msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
-msgstr "Heu de seleccionar, si m�s no, una clau.\n"
+msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
-msgstr "Realment voleu esborrar les claus seleccionades? "
+msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Realment voleu eliminar aquest ID d'usuari? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
 #, fuzzy
+msgid "Set preference list to:\n"
+msgstr "estableix la llista de prefer�ncies"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Eliminar tots els IDs seleccionats? "
+msgstr ""
+"Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1356
-#, fuzzy
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
-msgstr "Crear els certificats de revocaci�? (y/N)"
+msgstr "Realment voleu actualitzar les prefer�ncies? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
-msgstr "Desar els canvis? "
+msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
-msgstr "Eixir sense desar? "
+msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
-msgstr "ha fallat l'actualitzaci�: %s\n"
+msgstr "ha fallat l'actualitzaci�: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
+msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
-msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
+msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
-msgstr "L'ordre no �s v�lida (proveu �help�)\n"
+msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
-msgstr "ALERTA: Aquesta clau ha estat revocada pel propietari!\n"
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Resum: "
 
-#: g10/keyedit.c:1754
-msgid " (sensitive)"
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Funcionalitats: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
 msgstr ""
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
+# Potser %s haja d'anar darrere de �clau�.  ivb
+# �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
+#: g10/keyedit.c:2063
 #, c-format
-msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX  creada: %s expira: %s"
+msgid "This key may be revoked by %s key "
+msgstr "Aquesta clau pot ser revocada per la clau %s "
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr " (sensible)"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "no s'ha pogut creat %s: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revocada]"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [caduca: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [caduca: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:2107
 #, c-format
-msgid " trust: %c/%c"
-msgstr " confian�a: %c/%c"
+msgid "validity: %s"
+msgstr ""
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subclau ha estat revocada: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
-msgstr "rev- s'ha trobat una revocaci� falsa\n"
+msgstr "rev- s'ha trobat una revocaci� falsa\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problemes en la comprovaci� de la revocaci�: %s\n"
+msgstr "rev? hi ha problemes en la comprovaci� de la revocaci�: %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revocada]"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
+"Teniu en compte que la validesa de la clau mostrada no �s "
+"necess�riament\n"
+"correcta a no ser que torneu a executar el programa.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revocada]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[caducada]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"AV�S: no s'ha marcat cap ID d'usuari com prim�ria. Aquesta ordre pot\n"
+"      causar que una ID d'usuari diferent esdevinga en la prim�ria "
+"assumida.\n"
 
-#: g10/keyedit.c:2001
+# Photo ID com abans.  ivb
+#: g10/keyedit.c:2399
 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 ""
+"AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que "
+"algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:2006
-#, fuzzy
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Segur que voleu aquesta grand�ria? "
+msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr ""
+msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
-#: g10/keyedit.c:2147
+# Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
+# Hmm. S�... (s/N/x) jm
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
-msgstr "Esborrar aquesta signatura correcta? (y/N/q)"
+msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "Esborrar aquesta signatura inv�lida? (y/N/q)"
+msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "Esborrar aquesta signatura desconeguda? (y/N/q)"
+msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
-msgstr "Esborrar aquesta auto-signatura? (y/N)"
+msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:2181
+# Werner FIXME: use ngettext. jm
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
-msgstr "%d signatura esborrada.\n"
+msgstr "S'ha esborrat %d signatura.\n"
 
-#: g10/keyedit.c:2182
+# Werner FIXME: use ngettext. jm
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
-msgstr "%d signatures esborrades.\n"
+msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"AV�S: Aquesta �s una clau d'estil PGP 2.x. Afegir un revocador designat "
+"pot\n"
+"fer que algunes versions de PGP rebutjen aquesta clau.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Introdu�u la grand�ria de la clau"
+msgstr "Introdu�u l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
+"no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
+"AV�S: no es pot desfer la nominaci� d'una clau com a revocador "
+"designat!\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
-msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
+msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
-msgstr "Canviant la data de caducitat per a una clau secund�ria.\n"
+msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
-msgstr "Canviant la data de caducitat per a una clau prim�ria.\n"
+msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:2546
-#, fuzzy
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
-msgstr "Heu de seleccionar al menys un ID.\n"
+msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "No hi ha cap ID amb l'�ndex %d\n"
+msgstr "No hi ha cap ID amb l'�ndex %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
-msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
+msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
-msgstr "ID d'usuari: \""
+msgstr "ID d'usuari: �"
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
-"\"\n"
+"�\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:2918
+#: g10/keyedit.c:3499
 #, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
-"\"\n"
-"signat amb la vostra clau %08lX el %s\n"
+"�\n"
+"signat localment amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:2923
-#, fuzzy, c-format
+#: g10/keyedit.c:3504
+#, c-format
 msgid "This signature expired on %s.\n"
-msgstr "%s signatura de: %s\n"
+msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:2927
-#, fuzzy
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Realment voleu revocar aquesta clau? "
+msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
-#: g10/keyedit.c:2931
-#, fuzzy
+# (s/N) ivb
+# S! jm
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Crear un certificat de revocaci� per a aquesta signatura? (y/N)"
+msgstr ""
+"Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) "
 
-#. FIXME: detect duplicates here
-#: g10/keyedit.c:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
-msgstr "Heu signat els seg�ents ID d'usuari:\n"
+msgstr "Heu signat els seg�ents ID d'usuari:\n"
 
-#: g10/keyedit.c:2975
+#: g10/keyedit.c:3558
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s%s\n"
-msgstr "  signat per %08lX el %s\n"
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   signat per %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
-msgstr "  revocat per %08lX el %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
-#: g10/keyedit.c:3013
+#: g10/keyedit.c:3597
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
-msgstr "  signat per %08lX el %s\n"
+msgid "   signed by %s on %s%s\n"
+msgstr "   signat per %08lX el %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
-msgstr ""
+msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3022
-#, fuzzy
+# (s/N)?  ivb
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Crear els certificats de revocaci�? (y/N)"
+msgstr "Realment voleu crear els certificats de revocaci�? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "l'ID d'usuari �%s� ja est� revocat\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
+"AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr ""
+"S'est� mostrant el photo ID %s de mida %ld per a la clau 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "escriptura de l'autosignatura\n"
+msgstr "Pol�tica de signatura cr�tica: "
 
-#: g10/keylist.c:93
-#, fuzzy
+#: g10/keylist.c:181
 msgid "Signature policy: "
-msgstr "%s signatura de: %s\n"
+msgstr "Pol�tica de signatura: "
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
-msgstr "ALERTA: s'hi ha trobat dades de notaci� inv�lides\n"
+msgstr "AV�S: s'hi han trobat dades de notaci� inv�lides\n"
 
-#: g10/keylist.c:127
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr ""
+msgstr "Notaci� de signatura cr�tica: "
 
-#: g10/keylist.c:129
-#, fuzzy
+#: g10/keylist.c:288
 msgid "Signature notation: "
-msgstr "Notaci�: "
+msgstr "Notaci� de signatura: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
-msgstr ""
+msgstr "no llegible per humans"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
-msgstr ""
+msgstr "Anell"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [caduca: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
-msgstr "[caduca: %s]"
+msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revocada]"
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "llista claus i empremtes dactilars"
+msgstr "Empremtes digital de la clau prim�ria:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "        Empremta digital:"
+msgstr "     Empremta digital de la subclau:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "llista claus i empremtes dactilars"
+msgstr " Empremta digital de la clau prim�ria:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "        Empremta digital:"
+msgstr "      Empremta digital de la subclau:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
+#: g10/keylist.c:1372 g10/keylist.c:1376
 #, fuzzy
-msgid "     Key fingerprint ="
-msgstr "        Empremta digital:"
+msgid "      Key fingerprint ="
+msgstr "     Empremta digital ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "mida extranya per a una clau de sessi� xifrada (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
 msgstr ""
-"algoritme de hash inv�lid �%s�\n"
-"\n"
+"la contrasenya �s incorrecta o l'algoritme de xifratge (%d) �s "
+"desconegut\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "clau de sessi� xifrada amb %s\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
-msgstr "la clau p�blica �s %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "la clau p�blica �s %08lX\n"
+
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "dades xifrades amb clau p�blica: bona clau de xifratge (DEK)\n"
+msgstr "dades xifrades amb clau p�blica: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "ha fallat el desxifratge amb la clau p�blica: %s\n"
+msgstr "ha fallat el desxifratge amb la clau p�blica: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
-#, fuzzy, c-format
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "xifrat amb %lu contrasenyes\n"
+
+# FIXME WK: Use ngettext
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "xifrat amb 1 contrasenya\n"
+
+# I no ser� �dades xifrades amb %s�?  ivb
+# Sembla que s�, ho marque per a mirar-ho m�s endavant. jm
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "dades xifrades amb %s\n"
+msgstr "s'assumeixen dades xifrades amb %s\n"
 
-#: g10/mainproc.c:473
+# L'optim�stic �s aquell que t� una Fe Cega en que Tot Anir� B�!  ivb
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
+"El xifratge IDEA no est� disponible, s'intentar� utilitzar optimistament "
+"%s en el seu lloc\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "AV�S: el missatge no tenia protecci� d'integritat\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "ALERTA: el missatge xifrat ha estat manipulat!\n"
+msgstr "AV�S: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "NOTA: el remitent ha sol�licitat \"alt secret\"\n"
+msgstr "NOTA: el remitent ha sol�licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "revocaci� aut�noma: useu \"gpg --import\" per a aplicar-la\n"
-
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Notaci�: "
+msgstr "revocaci� aut�noma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Pol�tica: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
-msgstr "verificaci� de signatura eliminada\n"
+msgstr "s'ha eliminat la verificaci� de signatura\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
-msgstr "no es poden manejar aquestes signatures m�ltiples\n"
+msgstr "no es poden tractar aquestes signatures m�ltiples\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "Signatura creada %.*s usant una clau %s ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "              alias \""
+
+# �%.*s� no ser� una data?  Caldr� �el� al davant.  ivb
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "La clau �s disponible en: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
-#, fuzzy
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
-msgstr "Signatura correcta de \""
+msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
-msgstr ""
+msgstr "[incert]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Aquesta signatura va caducar el %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Aquesta signatura caduca el %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binari"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "mode text"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "desconeguda"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
-msgstr "no �s una signatura separada\n"
+msgstr "no �s una signatura separada\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"AV�S: s'han detectat m�ltiples signatures. Nom�s es comprovar� la "
+"primera.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "signatura aut�noma de classe 0x%02x\n"
+msgstr "signatura aut�noma de classe 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr "paquet arrel inv�lid detectat en proc_tree()\n"
+msgstr "s'ha detectat un paquet arrel inv�lid en proc_tree()\n"
 
-#: g10/misc.c:98
+# bolcats de mem�ria?  ivb
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "no s'han pogut desactivar els *core dump*: %s\n"
+msgstr "no s'han pogut desactivar els bolcats de mem�ria: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
-msgstr "No haur�eu d'usar algoritmes experimentals!\n"
+msgstr "No haur�eu d'usar algoritmes experimentals!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
-"aquest algoritme de xifrat est� desaconsellat; useu-ne un de m�s est�ndard!\n"
+"aquest algoritme de xifratge est� desaconsellat; useu-ne un de m�s "
+"est�ndard!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
-msgstr ""
+msgstr "el m�dul de xifratge IDEA no est� present\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
+"vegeu http://www.gnupg.org/why-not-idea.html per a m�s informaci�\n"
 
-#: g10/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s: no s'ha pogut obrir: %s\n"
+msgstr "%s:%d: l'opci� �%s� est� desaconsellada.\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ALERTA: �%s� �s un fitxer buit\n"
+msgstr "AV�S: %s �s una opci� desaconsellada.\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr ""
+msgstr "si us plau, utilitzeu �%s%s� en el seu lloc\n"
+
+# G�nere?  Nombre?  Passat, futur?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "No comprimit"
+
+# G�nere?  Nombre?  Passat, futur?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "No comprimit"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "aquest missatge pot no ser usable per %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "s'estan llegint opcions de �%s�\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "el destinatari predeterminat �s desconegut �%s�\n"
 
 #: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "no s'ha pogut manejar l'algoritme de clau p�blica %d\n"
+msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n"
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"AV�S: la clau de sessi� pot estar xifrada sim�tricament de forma "
+"insegura\n"
 
-#: g10/parse-packet.c:1065
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
+msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent no est� disponible en aquesta sessi�\n"
+msgstr "gpg-agent no est� disponible en aquesta sessi�\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
-msgstr ""
+msgstr "no es pot establir el pid del client per l'agent\n"
 
-#: g10/passphrase.c:458
+# llija/llegisca/llegesca.  ivb
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
-msgstr ""
+msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
-msgstr ""
+msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "variable d'entorn GPG_AGENT_INFO mal formada\n"
+msgstr "la variable d'entorn GPG_AGENT_INFO �s malformada\n"
 
-#: g10/passphrase.c:511
-#, fuzzy, c-format
+#: g10/passphrase.c:530
+#, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "l'algoritme de protecci� %d no est� suportat\n"
+msgstr "la versi� %d del protocol de gpg-agent no est� suportada\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "no s'ha pogut connectar amb �%s�: %s\n"
+msgstr "no s'ha pogut connectar amb �%s�: %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
-#, fuzzy
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
-msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
+msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID de la clau principal %08lX)"
 
 # Com es canvia l'ordre dels arguments? jm
 # Ah, bingo! jm
-# Uh, ara torna a donar error.
-# La idea �s ficar:
-# "Necessiteu la contrasenya per desbloquejar la clau secreta de l'usuari:\n"
-# "�%1$.*s�\n"
+# Uh, ara torna a donar error. FIXME
+# La idea �s ficar:
+# "Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n"
+# "�%1$.*s�\n"
 # "clau %3$s de %2$u bits, ID %4$08lX, creada en %5$s%6$s\n"
 # jm
-#: g10/passphrase.c:641
+# Se't passava l'argument �*�.  printf(3), hieroglyph(7).  ivb
+# Ah!  Prova-ho, no casque alguna cosa :P  ivb
+# Ah, ja veig! Moltes gr�cies! Aquest msgstr ha quedat curi�s :) jm
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
-"Necessiteu la contrasenya per desbloquejar la clau secreta de l'usuari:\n"
-"�%.*s�\n"
-"clau de %u bits, %s, ID %08lX, creada en %s%s\n"
-
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Introdu�u contrasenya\n"
+"Necessiteu la contrasenya per desblocar la clau secreta de l'usuari:\n"
+"�%2$.*1$s�\n"
+"clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
-msgstr "Repetiu contrasenya\n"
+msgstr "Repetiu la contrasenya\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Introdu�u la contrasenya\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
-msgstr "contrasenya massa llarga\n"
+msgstr "la contrasenya �s massa llarga\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
-msgstr "resposta inv�lida del agent\n"
+msgstr "la resposta de l'agent �s inv�lida\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
-msgstr "cancel�lat per l'usuari\n"
+msgstr "s'ha cancel�lat per l'usuari\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "no es pot demanar la contrasenya en mode desat�s\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Introdu�u la contrasenya: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 "\n"
-"Necessiteu la contrasenya per desbloquejar la clau secreta de\n"
+"Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "no es pot demanar la contrasenya en mode batch\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Introdu�u contrasenya: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (ID de la clau principal %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
-msgstr "Repetiu contrasenya: "
+msgstr "Repetiu la contrasenya: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "les dades no s'han desat; useu l'opci� \"--output\" per desar-les\n"
+msgstr "les dades no s'han desat; useu l'opci� \"--output\" per desar-les\n"
 
-#: g10/plaintext.c:108
-#, fuzzy, c-format
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
 msgid "error creating `%s': %s\n"
-msgstr "error en la lectura de �%s�: %s\n"
+msgstr "error en crear �%s�: %s\n"
 
-#: g10/plaintext.c:337
+# Indi? ivb
+# Em pense que no. jm
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
-msgstr "Introdu�u el nom del fitxer de dades: "
+msgstr "Introdu�u el nom del fitxer de dades: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
-msgstr "llegint stdin...\n"
+msgstr "s'est� llegint d'stdin...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
-#: g10/pubkey-enc.c:101
+# Indi? ivb
+# Yeh... jm
+#: g10/pubkey-enc.c:103
 #, fuzzy, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "destinatari an�nim; es provar� la clau secreta %08lX...\n"
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "el destinatari �s an�nim; es provar� la clau secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "d'acord, som el destinatari an�nim.\n"
+msgstr "d'acord, som el destinatari an�nim.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
-msgstr "la codificaci� antiga del DEK no est� suportada\n"
-
-#: g10/pubkey-enc.c:178
-#, fuzzy, c-format
-msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "l'algoritme de xifratge %d �s desconegut o est� desactivat\n"
-
-#: g10/pubkey-enc.c:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n"
+msgstr "la codificaci� antiga del DEK no est� suportada\n"
 
-#: g10/pubkey-enc.c:243
+#: g10/pubkey-enc.c:228
 #, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
-
-#: g10/pubkey-enc.c:249
-#, fuzzy
-msgid "NOTE: key has been revoked"
-msgstr "clau %08lX: aquesta clau ha estat revocada!\n"
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "l'algoritme de xifratge %d%s �s desconegut o est� desactivat\n"
 
-#: g10/hkp.c:71
+#: g10/pubkey-enc.c:266
 #, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "sol�licitud de la clau %08lX de %s...\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "no s'ha pogut obtenir del servidor la clau: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "error mentre s'enviava a `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "l'enviament a `%s' ha tingut �xit (status=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "l'enviament a `%s' ha fallat: status=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
+"NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n"
 
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
-
-#: g10/hkp.c:565
+#: g10/pubkey-enc.c:286
 #, fuzzy, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "no s'ha pogut obtenir del servidor la clau: %s\n"
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: g10/seckey-cert.c:53
+# Parts?  Peces?  ivb
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: g10/seckey-cert.c:59
-#, fuzzy, c-format
+#: g10/seckey-cert.c:60
+#, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "l'algoritme de protecci� %d no est� suportat\n"
+msgstr "l'algoritme de protecci� %d%s no est� suportat\n"
 
-#: g10/seckey-cert.c:224
-#, fuzzy
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "l'algoritme de protecci� %d%s no est� suportat\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
-msgstr "La contrasenya no �s v�lida; torneu a intentar-ho...\n"
+msgstr "La contrasenya no �s v�lida; torneu a intentar-ho"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
-msgstr ""
+msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "ALERTA: la clau �s feble; per favor, canvieu la contrasenya.\n"
+msgstr "AV�S: la clau �s feble; per favor, canvieu la contrasenya.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
+"s'est� generant la suma de comprovaci� desaconsellada de 16-bits per a "
+"la protecci� de la clau secreta\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
+msgstr "AV�S: conflicte de signatures digest en el missatge\n"
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:102
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"esta �s una clau ElGamal generada per PGP que NO �s segura per a "
-"signatures!\n"
+"AV�S: no es pot desfer la nominaci� d'una clau com a revocador "
+"designat!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "la clau p�blica �s %lu segons posterior a la signatura\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "la clau p�blica %08lX �s %lu segons anterior a la signatura\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "la clau p�blica �s %lu segons posterior a la signatura\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "la clau p�blica %08lX �s %lu segons anterior a la signatura\n"
 
-#: g10/sig-check.c:234
+# Werner FIXME: Use ngettext. jm
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
-"la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
+"la clau s'ha creat %lu segon en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/sig-check.c:236
+# Werner FIXME: use ngettext. jm
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
-"es supossa una signatura incorr�cta a causa d'un bit cr�tic desconegut\n"
+"es supossa una signatura incorrecta de la clau %08lX a causa d'un bit "
+"cr�tic desconegut\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr ""
+"clau %08lX: no hi ha una subclau per al paquet de la subclau de revocaci�\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr ""
+"clau %08lX: no hi ha una subclau per a la signatura de l'enlla� de la "
+"subclau\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"no es poden ficar dades de notaci� dins de signatures v3 (estil PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+"no es poden ficar dades de notaci� dins de signatures de clau v3 (estil "
+"PGP 2.x)\n"
+
+#: g10/sign.c:112
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
+"AV�S: no s'ha pogut %%-expandir la notaci� (massa gran). S'utilitza no "
+"expandida.\n"
 
-#: g10/sign.c:151
-#, c-format
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"no es pot ficar una URL de pol�tica dins de signatures v3 (estil PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"no es pot ficar una URL de pol�tica dins de signatures de clau v3 (estil "
+"PGP 2.x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
+"AV�S: no s'ha pogut %%-expandir l'url de pol�tica (massa gran). "
+"S'utilitza no expandida.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"AV�S: no s'ha pogut %%-expandir l'url de pol�tica (massa gran). "
+"S'utilitza no expandida.\n"
+
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "No s'ha pogut comprovar la signatura creada: %s\n"
+msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "%s signatura de: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s signatura de: �%s�\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "ALERTA: �%s� �s un fitxer buit\n"
+msgstr "AV�S: �%s� �s un fitxer buit\n"
 
-#: g10/sign.c:644
+#: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"nom�s podeu fer signatures separades amb claus d'estil PGP 2.x mentre "
+"esteu en mode --pgp2\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les prefer�ncies\n"
+msgstr ""
+"for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del "
+"destinatari\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"nom�s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1029
-#, fuzzy, c-format
+#: g10/sign.c:1138
+#, c-format
 msgid "%s encryption will be used\n"
-msgstr "ha fallat el desxifratge: %s\n"
+msgstr "s'utilitzar� xifratge %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "no es poden manejar l�nies m�s llargues de %d car�cters\n"
+msgstr "no es poden tractar l�nies m�s llargues de %d car�cters\n"
 
 #: g10/textfilter.c:231
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr "la l�nia d'entrada �s superior a %d car�cters\n"
+msgstr "la l�nia d'entrada �s superior a %d car�cters\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "reg de la base de dades de confian�a %lu: ha fallat lseek: %s\n"
+msgstr "reg de la base de dades de confian�a %lu: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
-"reg de la base de dades de confian�a %lu: ha fallat la escriptura (n=%d): %"
+"reg de la base de dades de confian�a %lu: ha fallat la escriptura (n=%d): %"
 "s\n"
 
 #: g10/tdbio.c:244
 msgid "trustdb transaction too large\n"
-msgstr "transacci� de la base de dades de confian�a massa gran\n"
+msgstr "la transacci� de la base de dades de confian�a �s massa gran\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: no s'ha pogut accedir: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+# blocatge? ivb
+# yep. jm
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s: no s'ha pogut crear el bloqueig\n"
+msgstr "%s: no s'ha pogut crear el blocatge\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
-#, fuzzy, c-format
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
 msgid "%s: can't make lock\n"
-msgstr "%s: no s'ha pogut crear el bloqueig\n"
+msgstr "%s: no s'ha pogut crear el blocatge\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no s'ha pogut crear: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: no s'ha pogut crear un registre de versi�: %s"
+msgstr "%s: no s'ha pogut crear un registre de versi�: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: s'ha creat una base de dades de confian�a inv�lida\n"
+msgstr "%s: s'ha creat una base de dades de confian�a inv�lida\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: s'ha creat la base de dades de confian�a\n"
+msgstr "%s: s'ha creat la base de dades de confian�a\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "NOTA: no es pot escriure en la base de dades de confian�a\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: base de dades de confian�a inv�lida\n"
+msgstr "%s: la base de dades de confian�a �s inv�lida\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: no s'ha pogut crear la taula hash: %s\n"
+msgstr "%s: no s'ha pogut crear la taula de dispersi�: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: error al actualitzar el registre de la versi�: %s\n"
+msgstr "%s: error en actualitzar el registre de la versi�: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: error al llegir el registre de la versi�: %s\n"
+msgstr "%s: error en llegir el registre de la versi�: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: error al escriure el registre de la versi�: %s\n"
+msgstr "%s: error en escriure el registre de la versi?: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "base de dades de confian�a: ha fallat lseek: %s\n"
+msgstr "base de dades de confian�a: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "base de dades de confian�a: ha fallat la lectura (n=%d): %s\n"
+msgstr "base de dades de confian�a: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s no �s un fitxer de base de dades de confian�a\n"
+msgstr "%s no �s un fitxer de base de dades de confian�a\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s: registre de versi� amb n�mero de registre %lu\n"
+msgstr "%s: registre de versi� amb n�mero de registre %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "%s: versi� de fitxer %d inv�lid\n"
+msgstr "%s: la versi� de fitxer %d �s inv�lida\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: error al llegir el registre lliure: %s\n"
+msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: error al escriure el registre de directoris: %s\n"
+msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"la base de dades de confian�a est� corrompuda; per favor, executeu �gpg --"
-"fix-trustdb�.\n"
+"la base de dades de confian�a est� corrompuda; per favor, executeu "
+"�gpg --fix-trustdb�.\n"
 
-#: g10/trustdb.c:200
-#, fuzzy, c-format
+#: g10/trustdb.c:226
+#, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "�%s� no �s un ID de clau llarg v�lid\n"
+msgstr "�%s� no �s un ID de clau llarg v�lid\n"
 
-#: g10/trustdb.c:235
+#: g10/trustdb.c:257
 #, fuzzy, c-format
-msgid "key %08lX: accepted as trusted key\n"
-msgstr "clau %08lX: acceptada com a clau fiable.\n"
+msgid "key %s: accepted as trusted key\n"
+msgstr "clau %08lX: s'accepta com a clau fiable\n"
 
-#: g10/trustdb.c:274
+#: g10/trustdb.c:295
 #, fuzzy, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "clau %08lX: no es pot introduir en la base de dades de confian�a\n"
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr ""
+"la clau %08lX apareix m�s d'una vegada en la base de dades de confian�a\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
-"clau %08lX: no hi ha una clau p�blica per a la clau fiable - ignorada\n"
+"clau %08lX: no hi ha una clau p�blica per a la clau fiable - es descarta\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "s'ha marcat la clau com a de confian�a absoluta.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut llegir: %s\n"
+msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
-#: g10/trustdb.c:338
-#, fuzzy, c-format
+#: g10/trustdb.c:350
+#, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "registre de confian�a %lu: no s'ha pogut eliminar: %s\n"
+msgstr "el registre de confian�a %lu no �s del tipus demanat %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n"
+msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "base de dades de confian�a: no s'ha pogut sincronitzar: %s\n"
+msgstr "base de dades de confian�a: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
 #, fuzzy
+msgid "never"
+msgstr "mai       "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
-msgstr "%s no �s un fitxer de base de dades de confian�a\n"
+msgstr ""
+"no �s necess�ria una comprovaci� de la base de dades de confian�a\n"
+"\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
-#, fuzzy, c-format
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "reg de la base de dades de confian�a %lu: ha fallat lseek: %s\n"
+msgstr ""
+"la pr?xima comprovaci� de la base de dades de confian�a ser� el %s\n"
 
-#: g10/trustdb.c:779
-#, fuzzy
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr ""
+"no �s necess�ria una comprovaci� de la base de dades de confian�a\n"
+"\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr ""
+"no �s necess�ria una comprovaci� de la base de dades de confian�a\n"
+"\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "no s'ha trobat la clau p�blica %08lX: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "si us plau, feu un --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
-msgstr "canvia la confian�a"
+msgstr "s'est� comprovant la base de dades de confian�a\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "no s'han trobat claus amb confian�a absoluta\n"
+
+#: g10/trustdb.c:1925
 #, fuzzy, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "no s'ha trobat la clau p�blica"
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr ""
+"no s'ha trobat la clau p�blica de la clau amb confian�a absoluta %08lX\n"
 
-#: g10/trustdb.c:1515
+#: g10/trustdb.c:1948
 #, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4134,271 +4800,263 @@ msgid ""
 msgstr ""
 "no s'ha pogut verificar la signatura.\n"
 "Recordeu que el fitxer de signatura (.sig o .asc)\n"
-"ha de ser el primer que figure en la l�nia d'ordres.\n"
+"ha de ser el primer que figure en la l�nia d'ordres.\n"
 
-#: g10/verify.c:173
+# LF -> fi de l�nia?  ivb
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "l�nia d'entrada %u massa llarga o hi falta LF\n"
+msgstr ""
+"la l�nia d'entrada %u �s massa llarga o hi falta un f� de l�nia\n"
 
 #: 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 clau no est� marcada com a insegura - no es pot utilitzar amb el GNA "
+"la clau no est� marcada com a insegura - no es pot utilitzar amb el GNA "
 "fals!\n"
 
 #: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "�%s� ignorat: duplicat\n"
+msgstr "es descarta �%s�: duplicat\n"
 
 #: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
-msgstr "�%s� ignorat: %s\n"
+msgstr "es descarta �%s�: %s\n"
 
 #: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
-msgstr "ignorat: clau secreta ja present\n"
+msgstr "es descarta: la clau secreta ja �s present\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"Ignorada �%s�: �s una clau ElGamal generada per PGP que no �s segura per a "
-"signatures!\n"
+"es descarta �%s�: �s una clau ElGamal generada per PGP que no �s "
+"segura per a signatures!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "El fitxer �%s� existeix. "
+msgstr "El fitxer �%s� existeix. "
 
 #: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
-msgstr "Sobreescriure? (s/N) "
+msgstr "Voleu sobreescriure? (s/N) "
 
 #: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
-msgstr "%s: sufix desconegut\n"
+msgstr "%s: el sufix �s desconegut\n"
 
 #: g10/openfile.c:141
 msgid "Enter new filename"
-msgstr "Introdu�u el nou nom del fitxer"
+msgstr "Introdu�u el nou nom del fitxer"
 
-#: g10/openfile.c:184
+# Indi?  ivb
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
-msgstr "escrivint en stdout\n"
+msgstr "s'est� escrivint en stdout\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "es supossa que les dades s'han signat amb �%s�\n"
+msgstr "s'asumeix que hi ha dades signades en �%s�\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: s'ha creat el nou fitxer d'opcions\n"
+msgstr "s'ha creat el nou fitxer d'opcions �%s�\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"AV�S: les opcions en �%s� encara no estan actives durant aquesta "
+"execuci�\n"
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no s'ha pogut crear el directori: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
-msgstr "%s: directori creat\n"
+msgstr "%s: s'ha creat el directori\n"
 
+# �s no-wrap?  ivb
+# Com? jm
 #: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"ATENCI�: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
-"sim�tric.\n"
+"ATENCI�: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
+"sim�tric.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
-msgstr "problema al manejar un paquet xifrat\n"
+msgstr "problema en tractar amb un paquet xifrat\n"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "s'hi ha creat una clau feble - reintent\n"
 
+# �s no-wrap?  ivb
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"no s'ha pogut evitar una clau feble per a xifratge sim�tric;\n"
+"no s'ha pogut evitar una clau feble per a xifratge sim�tric;\n"
 "hi ha hagut %d intents!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
+msgstr "DSA requereix l'�s d'un algoritme de dispersi� de 160 bits\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
 
-#: g10/delkey.c:126
+# Ah�!  Abans �batch� est� tal qual.  Cal unificar.  ivb
+# Fet. jm
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "no es pot fer aix� en el mode per lots sense �--yes�\n"
+msgstr "no es pot fer aix� en el mode desat�s sense �--yes�\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
-msgstr "Esborrar aquesta clau de l'anell? "
+msgstr "Voleu esborrar aquesta clau de l'anell? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
-msgstr "�s una clau secreta! Voleu esborrar-la? "
+msgstr "�s una clau secreta! Voleu esborrar-la? "
 
-# fuzzy... jm
-# (esborra aquest comentari i tal)
-#: g10/delkey.c:168
-#, fuzzy, c-format
+#: g10/delkey.c:157
+#, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "no s'ha pogut enumerar els blocs de claus: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
-msgstr ""
+msgstr "s'ha netejat la informaci� de la confian�a\n"
 
-#: g10/delkey.c:206
-#, fuzzy, c-format
+#: g10/delkey.c:195
+#, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "hi ha una clau secreta per a aquesta clau p�blica!\n"
+msgstr "hi ha una clau secreta per a la clau p�blica �%s�!\n"
 
-#: g10/delkey.c:208
-#, fuzzy
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "utilitzeu l'opci� �--delete-secret-key� per a eliminar-la primer.\n"
+msgstr ""
+"utilitzeu l'opci� �--delete-secret-keys� per a eliminar-la primer.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"L'assignaci� d'un valor ac� �s cosa vostra; aquest valor mai s'exportar�\n"
-"a cap tercer. Ho necessitem per a implementar la xarxa de confian�a; no te\n"
-"res a veure amb la xarxa de certificats (creada impl�citament)."
+"L'assignaci� d'un valor ac� �s cosa vostra; aquest valor mai "
+"s'exportar�\n"
+"a cap tercer. Ho necessitem per a implementar la xarxa de confian�a; no "
+"t�\n"
+"res a veure amb la xarxa de certificats (creada impl�citament)."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
+"Per a construir la xarxa de confian�a, GnuPG necessita saber quines claus\n"
+"tenen confian�a absoluta - aquestes s�n normalment les claus per a les "
+"que\n"
+"teniu acc�s a la clau secreta.  Contesteu �s�� per a donar a aquesta "
+"clau\n"
+"confian�a absoluta\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
-msgstr "Si voleu utilitzar aquesta clau revocada de totes maneres, dieu �s��."
+msgstr ""
+"Si voleu utilitzar aquesta clau revocada de totes maneres, dieu �s��."
 
-# fuzzy, "clau no confiable"? jm
-#: g10/helptext.c:64
+# "clau no confiable"? jm
+# No fiable, no de confian�a, no de fiar...  ivb
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
-"Si voleu utilitzar aquesta clau no confiable de totes maneres, dieu �s��."
+"Si voleu utilitzar aquesta clau no de confian�a de totes maneres, dieu "
+"�s��."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Introdu�u l'ID d'usuari de la persona a qui voleu enviar el missatge."
+msgstr ""
+"Introdu�u l'ID d'usuari de la persona a qui voleu enviar el missatge."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Seleccioneu l'algoritme a utilitzar.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (tamb� conegut com DSS) �s el algoritme de signatura digital que nom�s\n"
-"pot ser utilitzat per a signatures. Aquest �s el algoritme suggerit perque\n"
-"la comprovaci� de signatures DSA �s molt m�s r�pida que les de ElGamal.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal �s un algoritme que es pot utilitzar per a signatures i xifrat.\n"
-"OpenPGP distingueix entre 2 variants d'aquest algoritme: una de nom�s "
-"xifrat\n"
-"i una de signatura+xifrat; en veritat �s el mateix, per� alguns par�mentres\n"
-"han de seleccionar-se d'una manera especial per a crear claus m�s segures\n"
-"per a signatures: aquest programa fa a��, per� altres implementacions\n"
-"d'OpenPGP no estan obligades a entendre la variant signatura+xifrat.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"La primera clau (prim�ria) ha de ser sempre una clau que siga capa� de "
-"signar;\n"
-"aquesta �s la ra� per la que la clau de nom�s encriptaci� ElGamal no est�\n"
-"disponible en aquest men�."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Encara que aquestes claus estan definides en RFC2440, no es recomanen\n"
-"Perqu� no tots els programes hi poden treballar i perqu� les\n"
-"signatures que generen s�n molt llargues i lentes de verificar."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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 ""
+"En general no �s bona idea utilitzar la mateixa clau per a signar i\n"
+"xifrar. Aquest algoritme nom�s s'hauria d'usar en tasques concretes.\n"
+"Si us plau, consulteu al vostre expert en seguretat primer."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
-msgstr "Introdu�u la grand�ria de la clau"
+msgstr "Introdu�u la grand�ria de la clau"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
-msgstr "Contesteu �s�� o �no�"
+msgstr "Contesteu �s�� o �no�"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"Introdu�u el valor requerit tal i com es mostra en l'indicatiu.\n"
-"�s possible introduir una data USO (AAAA-MM-DD) per� no rebreu\n"
-"una bona resposta d'error - en canvi, el sistema tractar� d'interpretar\n"
+"Introdu�u el valor requerit tal i com es mostra en l'indicatiu.\n"
+"�s possible introduir una data ISO (AAAA-MM-DD) per� no rebreu\n"
+"una bona resposta d'error - en canvi, el sistema tractar� d'interpretar\n"
 "el valor donat com un interval."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
-msgstr "Introdu�u el nom del propietari de la clau"
+msgstr "Introdu�u el nom del propietari de la clau"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
-msgstr "introdu�u una adre�a de correu (opcional per� molt recomanable)"
+msgstr "introdu�u una adre�a de correu (opcional per� molt recomanable)"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
-msgstr "Introdu�u un comentari opcional"
+msgstr "Introdu�u un comentari opcional"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4408,15 +5066,16 @@ msgid ""
 msgstr ""
 "N  canvia el nom.\n"
 "C  canvia el comentari.\n"
-"E  canvia l'adre�a de correu electr�nic.\n"
-"O  continua la generaci� de les claus.\n"
+"E  canvia l'adre�a de correu electr�nic.\n"
+"O  continua la generaci� de les claus.\n"
 "Q  ix."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "Contesteu �s�� (o nom�s �s�) si �s correcte generar la subclau."
+msgstr ""
+"Contesteu �s�� (o nom�s �s�) si �s correcte generar la subclau."
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 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"
@@ -4456,56 +5115,100 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
+"Quan signeu un ID d'usuari d'una clau, primer haur?eu de verificar que la "
+"clau\n"
+"pertany a la persona esmentada en l'ID d'usuari.  �s �til per a altres "
+"saber\n"
+"amb quanta cura heu verificat a��.\n"
+"\n"
+"�0� significa que no feu cap declaraci� de amb quanta cura heu "
+"verificat\n"
+"    la clau.\n"
+"\n"
+"�1� significa que creieu que la clau �s de la persona que diu que �s "
+"la\n"
+"    propiet�ria, per� no heu pogut, o no heu verificat la clau de cap "
+"manera.\n"
+"    A�� �s �til per a la verificaci� d'un �rol�, quan signeu "
+"la clau d'un\n"
+"    usuari amb pseud�nim.\n"
+"\n"
+"�2� significa que heu fet algunes comprovacions de la clau. Per exemple, "
+"a��\n"
+"    pot significar que heu verificat la emprenta digital de la clau i "
+"verificat\n"
+"    l'ID d'usuari en la clau amb el photo ID.\n"
+"\n"
+"�3� significa que heu fet una verificaci� exhaustiva de la clau. Per "
+"exemple,\n"
+"    a�� pot significar que heu verificat la emprenta digital amb el "
+"propietari\n"
+"    de la clau en persona, i que heu comprovat, mitjan�ant un document "
+"dif�cil\n"
+"    de falsificar amb photo ID (com un passaport) que el nom del propietari\n"
+"    coincideix amb el nom de l'ID d'usuari en la clau, i finalment que heu\n"
+"    verificat (per intercanvi de correu) que l'adre�a de correu en la "
+"clau\n"
+"    pertany al propietari de la clau.\n"
+"\n"
+"Teniu en compte que els exemples donats anteriorment per als nivels 2 i 3 "
+"s�n\n"
+"*nom�s* exemples. Al final, �s cosa vostra decidir qu� significa "
+"�alguna� i\n"
+"�exhaustiva� per a vosaltres quan voleu signar altres claus.\n"
+"\n"
+"Si no sabeu quina �s la resposta correcta, contesteu �0�."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
-msgstr "Contesteu �s�� si voleu signar TOTS els ID d'usuari"
+msgstr "Contesteu �s�� si voleu signar TOTS els ID d'usuari"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
-"Contesteu �s�� si realment voleu eliminar aquest ID d'usuari.\n"
-"Tots els certificats tamb� es perdran!"
+"Contesteu �s�� si realment voleu eliminar aquest ID d'usuari.\n"
+"Tots els certificats tamb� es perdran!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Contesteu �s�� si �s correcte eliminar la subclau"
+msgstr "Contesteu �s�� si �s correcte eliminar la subclau"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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 ""
-"Aquesta �s una signatura v�lida en la clau; normalment no voldreu\n"
-"eliminar aquesta signatura perque pot ser important per a establir\n"
-"una connexi� de confian�a a la clau o a un altra clau certificada\n"
+"Aquesta �s una signatura v�lida en la clau; normalment no voldreu\n"
+"eliminar aquesta signatura perqu� pot ser important per a establir\n"
+"una connexi� de confian�a a la clau o a un altra clau certificada\n"
 "per aquesta clau."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"Aquesta signatura no es pot comprovar perque no teniu la clau\n"
-"corresponent. Haurieu de pospossar la seua eliminaci� fins que\n"
-"sapigueu quina clau es va utilitzar ja que aquesta clau de signatura\n"
-"podria establir una connexi� de confian�a a trav�s d'una altra clau ja\n"
+"Aquesta signatura no es pot comprovar perqu� no teniu la clau\n"
+"corresponent. Haur�eu de posposar la seua eliminaci� fins que\n"
+"sapieu quina clau es va utilitzar ja que aquesta clau de signatura\n"
+"podria establir una connexi� de confian�a a trav�s d'una altra clau "
+"ja\n"
 "certificada."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
-"La signatura no �s v�lida. T� sentit que l'elimineu de l'anell\n"
+"La signatura no �s v�lida. T� sentit que l'elimineu de l'anell\n"
 "de claus."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4513,47 +5216,49 @@ msgid ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"Aquesta �s una signatura que enlla�a el ID de l'usuari a la clau.\n"
-"Normalment no �s una bona idea eliminar una signatura com aquesta.\n"
-"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, aix�\n"
-"que feu a�� nom�s si la auto-signatura no �s v�lida per alguna ra� i\n"
+"Aquesta �s una signatura que enlla�a l'ID de l'usuari amb la clau.\n"
+"Normalment no �s una bona idea eliminar una signatura com aquesta.\n"
+"Actualment, GnuPG podria no poder utilitzar aquesta clau de nou, aix�\n"
+"que feu a�� nom�s si l'autosignatura no �s v�lida per alguna ra� "
+"i\n"
 "hi ha una segona disponible."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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 ""
+"Canvia les prefer�ncies de tots els ID d'usuari (o nom�s els dels "
+"seleccionats)\n"
+"a la llista actual de prefer�ncies. Les marques de temps de totes les\n"
+"autosignatures afectades s'avan�aran un segon.\n"
 
-#: g10/helptext.c:244
-#, fuzzy
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-"Introdu�u la contrasenya; aquesta ha de ser una frase secreta \n"
-"  Blurb, blurb..."
+msgstr "Introdu�u la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Per favor, repetiu l'�ltima contrasenya per confirmar-la."
+msgstr "Per favor, repetiu l'�ltima contrasenya per confirmar-la."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
-msgstr "Doneu el nom del fitxer al que s'aplica la signatura"
+msgstr "Doneu el nom del fitxer al qual s'aplica la signatura"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Contesteu �s�� si �s correcte sobreescriure el fitxer"
+msgstr "Contesteu �s�� si �s correcte sobreescriure el fitxer"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"Introdu�u un nom de fitxer. Si premeu RETURN s'hi usar� el fitxer\n"
-"predeterminat (apareix entre claud�tors)."
+"Introdu�u un nom de fitxer. Si premeu RETORN s'hi usar� el fitxer\n"
+"predeterminat (apareix entre claud�tors)."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4568,130 +5273,764 @@ msgid ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
-"Haurieu d'especificar una ra� per a la certificaci�. Depenent en el\n"
+"Haur�eu d'especificar una ra� per a la certificaci�. Depenent del\n"
 "context teniu l'habilitat de triar d'aquesta llista:\n"
-"  �La clau ha estat compromesa�\n"
-"      Utilitzeu a�� si teniu alguna ra� per a creure que persones no\n"
-"      autoritzades han tingut acc�s a la vostra clau secreta.\n"
-"  �La clau ha estat reempla�ada�\n"
-"      Utilitzeu a�� si heu reempla�at aquesta clau amb una m�s nova.\n"
-"  �La clau ja no est� en �s�\n"
-"      Utilitzeu a�� si heu retirat aquesta clau.\n"
-"  �L'ID de l'usuari ja no �s v�lid�\n"
-"      Utilitzeu a�� per a constatar que l'ID de l'usuari no s'hauria\n"
-"      d'utilitzar m�s; a�� s'utilitza normalment per a marcar una adre�a\n"
-"      de correu com inv�lida.\n"
-
-#: g10/helptext.c:286
+"  �La clau ha estat compromesa�\n"
+"      Utilitzeu a�� si teniu alguna ra� per creure que persones no\n"
+"      autoritzades han tingut acc�s a la vostra clau secreta.\n"
+"  �La clau ha estat reempla�ada�\n"
+"      Utilitzeu a�� si heu reempla�at aquesta clau amb una m�s "
+"nova.\n"
+"  �La clau ja no est� en �s�\n"
+"      Utilitzeu a�� si heu retirat aquesta clau.\n"
+"  �L'ID de l'usuari ja no �s v�lid�\n"
+"      Utilitzeu a�� per a constatar que l'ID de l'usuari no s'hauria\n"
+"      d'utilitzar m�s; a�� s'utilitza normalment per a marcar una "
+"adre�a\n"
+"      de correu com a inv�lida.\n"
+
+#: g10/helptext.c:275
 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 ""
-"Si voleu podeu introduir un text que descriga per qu� expediu aquest\n"
-"certificat de revocaci�. Per favor, sigueu concisos.\n"
-"Una l�nia buida indica el final del text.\n"
+"Si voleu podeu introduir un text que descriga per qu� expediu aquest\n"
+"certificat de revocaci�. Per favor, sigueu concisos.\n"
+"Una l�nia buida indica el final del text.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "No hi ha ajuda disponible"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/keydb.c:178
-#, fuzzy, c-format
+#: g10/keydb.c:189
+#, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
+msgstr "error en crear l'anell �%s�: %s\n"
 
-#: g10/keydb.c:185
-#, fuzzy, c-format
+#: g10/keydb.c:196
+#, c-format
 msgid "keyring `%s' created\n"
-msgstr "%s: anell creat\n"
+msgstr "s'ha creat l'anell �%s?\n"
 
-#: g10/keydb.c:575
-#, fuzzy, c-format
+#: g10/keydb.c:615
+#, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "%s: no s'ha pogut crear la taula hash: %s\n"
+msgstr "no s'ha pogut reconstruir la mem�ria cau de l'anell: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "ALERTA: hi ha 2 fitxers amb informaci� confidencial.\n"
+msgstr "AV�S: hi ha 2 fitxers amb informaci� confidencial.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
-msgstr "%s �s el que no ha canviat\n"
+msgstr "%s �s el que no ha canviat\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
-msgstr "%s �s el nou\n"
+msgstr "%s �s el nou\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 
-#: g10/keyring.c:1346
+#: g10/keyring.c:1360
 #, fuzzy, c-format
-msgid "checking keyring `%s'\n"
-msgstr "no s'ha pogut tancar l'anell �%s�: %s\n"
+msgid "caching keyring `%s'\n"
+msgstr "s'est� comprovant l'anell �%s�\n"
 
-#: g10/keyring.c:1377
+#: g10/keyring.c:1406
 #, fuzzy, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "fins ara s'han processat %lu claus\n"
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1388
+#: g10/keyring.c:1418
 #, fuzzy, c-format
-msgid "%lu keys checked (%lu signatures)\n"
-msgstr "llista claus i signatures"
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1453
+# Fitxer indi fins final.  Hau!  ivb
+# Grrr. Com em tracten els esclaus ja... jm
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
-msgstr "%s: anell creat\n"
+msgstr "%s: s'ha creat l'anell\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Seleccioneu una imatge per a utilitzarla en el vostre photo ID. La imatge\n"
+"ha de ser un fitxer JPEG. Recordeu que la imatge es desa dins de la vostra\n"
+"clau p�blica. Si utilitzeu una foto molt gran, la vostra clau tamb� es "
+"far�\n"
+"molt gran!\n"
+"Es recomana una imatge amb una mida aproximada de 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Introdu�u el nom del fitxer JPEG per al photo ID: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "No s'ha pogut obrir la foto �%s�: %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "�%s� no �s un fitxer JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "�s aquesta foto correcta (s/N/x)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "no s'ha pogut mostrar el photo ID!\n"
+
+# Execuci� de programes remots, o execuci� remota de programes? jm
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "no hi ha suport per a l'execuci� remota de programes\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "no es pot crear el directori �%s�: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"les crides a programes externs estan inhabilitades per tindre el fitxer "
+"d'opcions permissos insegurs\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"aquesta plataforma necessita fitxers temporals quan es crida a programes "
+"externs\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "no s'ha pogut executar %s �%s�: %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "s'ha produ�t un error del sistema en cridar el programa extern: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "s'ha produ�t una eixida no natural del programa extern\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "no s'ha pogut executar el programa extern\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "no s'ha pogut llegir la resposta del programa extern: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) �%s�: %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "AV�S: no s'ha pogut eliminar el directori temporal �%s�: %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "mai       "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "ha fallat build_packet: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "clau %08lX: sense ID\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "A ser revocada per:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Aquesta �s una clau de revocaci� sensible)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Voleu crear un certificat de revocaci� per a aquesta clau? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "s'ha for�at l'eixida d'armadura ASCII.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "ha fallat make_keysig_packet: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "S'ha creat el certificat de revocaci�.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "no s'han ttrobat claus de revocaci� per a �%s�\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "no s'ha trobat la clau secreta �%s�: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "no hi ha cap clau p�blica corresponent: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "la clau p�blica no coincideix amb la clau secreta!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "l'algorisme de protecci� �s desconegut\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOTA: Aquesta clau no est� protegida!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"S'ha creat un certificat de revocaci�.\n"
+"\n"
+"Si us plau, mogueu-lo a un medi que pugueu amagar; si Mallory aconsegueix\n"
+"acc�s a aquest certificat pot utilitzar-lo per a fer la vostra clau\n"
+"inservible. �s intel�ligent imprimir aquest certificat i amagar-lo, per\n"
+"si el vostre medi es torna illegible. Per� aneu amb compte: el sistema\n"
+"d'impressi� de la vostra m�quina podria emmagatzemar les dades i fer-"
+"les\n"
+"disponibles a altres!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Seleccioneu la ra� de la revocaci�:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Cancel�la"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Segurament voleu seleccionar %d ac�)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+"Introdu�u una descripci� opcional; finalitzeu amb una l�nia en blanc:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Ra� de la revocaci�: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(No es va donar una descripci�)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "�s a�� correcte? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Llista de valors de confian�a assignats, creat el %s\n"
+"# (Utilitzeu �gpg --import-ownertrust� per a restaurar-les)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "no es pot obrir el fitxer: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "la l�nia �s massa llarga\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "error: falten dos punts\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "error: l'empremta digital �s inv�lida\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "error: no hi ha cap valor de confian�a\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "error en trobar el registre de confian�a: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "error de lectura: %s\n"
 
-#, fuzzy
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
-#~ "heu d'executar GnuPG de nou perqu� puga llegir el nou fitxer d'opcions\n"
+#~ "AV�S: el resum �%s� no �s part d'OpenPGP. Utilitzeu-lo assumint "
+#~ "el risc!\n"
 
-#~ msgid "too many random bits requested; the limit is %d\n"
-#~ msgstr "massa bits aleatoris sol�licitats; el l�mit �s %d\n"
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[fitxers]|xifra fitxers"
 
-#~ msgid "|[NAMES]|check the trust database"
-#~ msgstr "|[NOMS]|comprova la base de dades de confian�a"
+#~ msgid "store only"
+#~ msgstr "nom�s emmagatzema"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NOM=VALOR|usa aquesta notaci� de dades"
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[fitxers]|desxifra fitxers"
 
-#~ msgid "--delete-secret-key user-id"
-#~ msgstr "--delete-secret-key user-id"
+#~ msgid "sign a key non-revocably"
+#~ msgstr "signa una clau irrevocablement"
 
-#~ msgid "--delete-key user-id"
-#~ msgstr "--delete-key user-id"
+# D'altres formes o no queda clar o �s massa literari :P  ivb
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "signa una clau de forma local i irrevocable"
 
-#~ msgid "--delete-secret-and-public-key user-id"
-#~ msgstr "--delete-secret-and-public-key user-id"
+#~ msgid "list only the sequence of packets"
+#~ msgstr "llista nom�s la seq��ncia de paquets"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "exporta els valors de confian�a"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "importa els valors de confian�a"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "actualitzaci� no atesa de la base de dades de confian�a"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "arregla una base de dades de confian�a corrompuda"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "lleva l'armadura a un fitxer o a stdin"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "crea l'armadura d'un fitxer o d'stdin"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOM|usa NOM com a destinatari predeterminat"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usa la clau predeterminada com a destinatari predeterminat"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "no usa el terminal en absolut"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "for�a signatures v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "no for�a signatures v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "for�a signatures de clau v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "no for�a signatures de clau v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "sempre utilitza un MDC per a xifrar"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "mai utilitza un MDC per a xifrar"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "utilitza el gpg-agent"
+
+# Mode desat�s (SC)  ivb
+#~ msgid "batch mode: never ask"
+#~ msgstr "mode desat�s: no pregunta mai"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "suposa �s�� en la majoria de les preguntes"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "suposa �no� en la majoria de les preguntes"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "afegeix aquest anell a la llista"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "afegeix aquest anell secret a la llista"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "mostra en quin anell de claus est� una clau llistada"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NOM|usa NOM com a clau secreta predeterminada"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|usa aquest servidor per a cercar claus"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOM|el joc de car�cters ser� NOM"
+
+#~ msgid "read options from file"
+#~ msgstr "llig opcions del fitxer"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|fitxer|escriu informaci� d'estat en un fitxer"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|IDCLAU|confia absolutament en aquesta clau"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FITXER|carrega el m�dul d'extensi� especificat"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emula el mode descrit en RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "estableix totes les opcions de paquets, xifratge i resum al comportament "
+#~ "d'OpenPGP"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "estableix totes les opcions de paquets, xifratge i resum al comportament "
+#~ "de PGP 2.x"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|usa el mode de contrasenya especificat"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|NOM|usa l'algoritme de resum de missatges NOM per a les contrasenyes"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NOM|usa l'algoritme de xifratge NOM"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usa l'algoritme de compressi� N"
+
+# elimina o descarta? jm
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "descarta el camp keyid dels paquets xifrats"
+
+# Werner FIXME: uncapitalize
+#~ msgid "Show Photo IDs"
+#~ msgstr "mostra els Photo ID"
+
+# Werner FIXME: uncapitalize
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "no mostra els Photo ID"
+
+# Werner FIXME: uncapitalize
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "fixa l'ordre per a veure Photo ID"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "l'algorisme de compressi� �%s� es de nom�s lectura en aquesta "
+#~ "versi�\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "l'algoritme de compressi� ha d'estar en l'interval %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: No hi ha garanties que aquesta clau pertanya realment al seu\n"
+#~ "propietari per� s'accepta de tota manera\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "la prefer�ncia %c%lu no �s v�lida\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "clau %08lX: no �s una clau rfc2440 - es descarta\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "NOTA: s'ha detectat una clau prim�ria Elgamal - a�� pot trigar un "
+#~ "temps en importar-se\n"
+
+#~ msgid " (default)"
+#~ msgstr " (predeterminat)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Notaci�: "
+
+#~ msgid "Policy: "
+#~ msgstr "Pol�tica: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "s'est� sol�licitant la clau %08lX de %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "no s'ha pogut obtenir del servidor la clau: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "error mentre s'enviava a �%s�: %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "l'enviament a �%s� ha tingut �xit (status=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "l'enviament a �%s� ha fallat: status=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "aquest servidor de claus no suporta --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "s'est� cercant �%s� al servidor HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "no es pot cercar el servidor de claus: %s\n"
+
+# Werner FIXME: Settle on Elgamal or ElGamal. jm
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "clau %08lX: aquesta �s una clau ElGamal que NO �s segura per a "
+#~ "signatures!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "la clau %08lX s'ha creat %lu segon en el futur (salt en el temps o "
+#~ "problemes\n"
+#~ "amb el rellotge)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "la clau %08lX s'ha creat %lu segons en el futur (salt en el temps o "
+#~ "problemes\n"
+#~ "amb el rellotge)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "s'ha marcat la clau %08lX com confiada absolutament\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "s'omet la signatura de la clau de signatura Elgamal %08lX a %08lX\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "s'omet la signatura de %08lX a la clau de signatura Elgamal %08lX\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "s'est� comprovant en profunditat %d signat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%"
+#~ "d/%d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Seleccioneu l'algoritme a utilitzar.\n"
+#~ "\n"
+#~ "DSA (tamb� conegut com a DSS) �s el algorisme de signatura digital "
+#~ "que nom�s\n"
+#~ "pot ser utilitzat per a signatures. Aquest �s el algoritme suggerit "
+#~ "perqu�\n"
+#~ "la comprovaci� de signatures DSA �s molt m�s r�pida que les "
+#~ "d'ElGamal.\n"
+#~ "\n"
+#~ "ElGamal �s un algorisme que es pot utilitzar per a signatures i "
+#~ "xifratge.\n"
+#~ "OpenPGP distingueix entre 2 variants d'aquest algorisme: una de nom�s "
+#~ "xifratge\n"
+#~ "i una de signatura+xifratge; en veritat �s el mateix, per� alguns "
+#~ "par�metres\n"
+#~ "han de seleccionar-se d'una manera especial per a crear claus m�s "
+#~ "segures\n"
+#~ "per a signatures: aquest programa fa a��, per� altres "
+#~ "implementacions\n"
+#~ "d'OpenPGP no estan obligades a entendre la variant signatura+xifratge.\n"
+#~ "\n"
+#~ "La primera clau (prim�ria) ha de ser sempre una clau que siga capa� "
+#~ "de signar;\n"
+#~ "aquesta �s la ra� per la qual la clau de nom�s xifratge ElGamal no "
+#~ "est�\n"
+#~ "disponible en aquest men�."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Encara que aquestes claus estan definides en RFC2440, no es recomanen\n"
+#~ "perqu� no tots els programes hi poden treballar i perqu� les\n"
+#~ "signatures que generen s�n molt llargues i lentes de verificar."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "fins ara s'han comprovat %lu claus (%lu signature)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "clau incompleta\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "la clau %08lX �s incompleta\n"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (signar i xifrar)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "L'�s d'aquest algorisme nom�s est� suportat per GnuPG. No podreu "
+#~ "utilitzar aquesta clau per a comunicar-vos amb usuaris de PGP. Aquest "
+#~ "algorisme tamb� �s molt lent, i potser no �s tan segur com les "
+#~ "altres alternatives.\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "Voleu crear la clau de tota manera? "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "algoritme de clau sim�tric inv�lid detectat (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "aquest servidor de clau no �s completament compatible amb HKP\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr ""
+#~ "L'�s d'aquest algoritme est� desaconsellat - el voleu crear "
+#~ "igualment? "
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NOM=VALOR|usa aquesta notaci� de dades"
 
 #~ msgid ""
 #~ "the first character of a notation name must be a letter or an underscore\n"
 #~ msgstr ""
-#~ "el primer car�cter de la notaci� ha de ser una lletra o un subratllat\n"
+#~ "el primer car�cter de la notaci� ha de ser una lletra o un "
+#~ "subratllat\n"
 
 #~ msgid "dots in a notation name must be surrounded by other characters\n"
-#~ msgstr "els punts han d'estar envoltat per altres car�cters\n"
+#~ msgstr "els punts han d'estar envoltats per altres car�cters\n"
 
-#~ msgid "For info see http://www.gnupg.org"
-#~ msgstr "Si voleu m�s informaci� vegeu http://www.gnupg.org"
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "AV�S: Aquesta clau ja te un photo ID.\n"
+#~ "        Afegir un altre photo ID pot confondre algunes versions de PGP.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "Nom�s podeu tenir un photo ID en una clau.\n"
 
 #~ msgid "Fingerprint:"
 #~ msgstr "Empremta digital:"
 
+#~ msgid "             Fingerprint:"
+#~ msgstr "        Empremta digital:"
+
+#~ msgid "you have to start GnuPG again, so it can read the new options file\n"
+#~ msgstr ""
+#~ "heu d'executar GnuPG de nou per que puga llegir el nou fitxer d'opcions\n"
+
+#~ msgid "changing permission of  `%s' failed: %s\n"
+#~ msgstr "no s'han pogut canviar els permissos de �%s�: %s\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "massa bits aleatoris sol�licitats; el l�mit �s %d\n"
+
+#~ msgid "|[NAMES]|check the trust database"
+#~ msgstr "|[NOMS]|comprova la base de dades de confian�a"
+
+#~ msgid "--delete-secret-key user-id"
+#~ msgstr "--delete-secret-key user-id"
+
+#~ msgid "--delete-key user-id"
+#~ msgstr "--delete-key user-id"
+
+#~ msgid "--delete-secret-and-public-key user-id"
+#~ msgstr "--delete-secret-and-public-key user-id"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Si voleu m�s informaci� vegeu http://www.gnupg.org"
+
 #~ msgid "sSmMqQ"
 #~ msgstr "sSmMqQ"
 
@@ -4700,43 +6039,46 @@ msgstr "%s: anell creat\n"
 #~ "can assign some missing owner trust values.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No s'ha trobat un cam� de confian�a v�lid a la clau. Vegem si podem\n"
-#~ "assignar valors de confian�a no assignats.\n"
+#~ "No s'ha trobat un cam� de confian�a v�lid a la clau. Vegem si "
+#~ "podem\n"
+#~ "assignar valors de confian�a no assignats.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "No path leading to one of our keys found.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No s'ha trobat un cam� que condueixe a una de les nostres claus.\n"
+#~ "No s'ha trobat un cam� que condueixe a una de les nostres claus.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "No certificates with undefined trust found.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No s'han trobat certificats amb confian�a no definida.\n"
+#~ "No s'han trobat certificats amb confian�a no definida.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "No trust values changed.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "No s'ha canviat cap valor de confian�a.\n"
+#~ "No s'ha canviat cap valor de confian�a.\n"
 #~ "\n"
 
 #~ msgid "%08lX: no info to calculate a trust probability\n"
 #~ msgstr ""
-#~ "%08lX: no hi ha informaci� per a calcular una probabilitat de confian�a\n"
+#~ "%08lX: no hi ha informaci� per a calcular una probabilitat de "
+#~ "confian�a\n"
 
 #~ msgid "Enter the user ID: "
-#~ msgstr "Introdu�u el nom d'usuari: "
+#~ msgstr "Introdu�u el nom d'usuari: "
 
 #~ msgid "skipped: public key already set with --encrypt-to\n"
-#~ msgstr "ignorat: la clau p�blica ja s'ha especificat amb --encrypt-to\n"
+#~ msgstr ""
+#~ "es descarta: la clau p�blica ja s'ha especificat amb --encrypt-to\n"
 
 #~ msgid "%s: error checking key: %s\n"
-#~ msgstr "%s: error en la comprovaci� de la clau: %s\n"
+#~ msgstr "%s: error en la comprovaci� de la clau: %s\n"
 
 #~ msgid "Do you really want to create a sign and encrypt key? "
 #~ msgstr "Segur que voleu crear una clau de signatura i xifratge? "
@@ -4752,28 +6094,30 @@ msgstr "%s: anell creat\n"
 
 #~ msgid "too many entries in unk cache - disabled\n"
 #~ msgstr ""
-#~ "massa entrades en la mem�ria cau de claus desconegudes - desactivada\n"
+#~ "massa entrades en la mem�ria cau de claus desconegudes - desactivada\n"
 
 #~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
 #~ msgstr "clau secreta %08lX no importada (utilitzeu %s per a permitir-ho)\n"
 
 #~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "clau %08lX: la nostra c�pia no t� auto-signatura\n"
+#~ msgstr "clau %08lX: la nostra c�pia no t� autosignatura\n"
 
 #~ msgid "%s: user not found\n"
 #~ msgstr "%s: no s'ha trobat l'usuari\n"
 
 #~ msgid "update of trustdb failed: %s\n"
-#~ msgstr "ha fallat l'actualitzaci� de la base de dades de confian�a: %s\n"
+#~ msgstr ""
+#~ "ha fallat l'actualitzaci� de la base de dades de confian�a: %s\n"
 
 #~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n"
+#~ msgstr ""
+#~ "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n"
 
 #~ msgid "%s: not a valid key ID\n"
-#~ msgstr "%s: no �s un ID v�lid\n"
+#~ msgstr "%s: no �s un ID v�lid\n"
 
 #~ msgid "assuming bad MDC due to an unknown critical bit\n"
-#~ msgstr "es suposa MDC erroni a causa d'un bit cr�tic desconegut\n"
+#~ msgstr "es suposa MDC erroni a causa d'un bit cr�tic desconegut\n"
 
 #~ msgid "error reading dir record for LID %lu: %s\n"
 #~ msgstr "error al llegir el registre de directori per al LID %lu: %s\n"
@@ -4782,69 +6126,63 @@ msgstr "%s: anell creat\n"
 #~ msgstr "lid %lu: s'esperava registre de directori, s'ha obtingut %d\n"
 
 #~ msgid "no primary key for LID %lu\n"
-#~ msgstr "no hi ha una clau prim�ria per al LID %lu\n"
+#~ msgstr "no hi ha una clau prim�ria per al LID %lu\n"
 
 #~ msgid "error reading primary key for LID %lu: %s\n"
-#~ msgstr "error al llegir clau prim�ria per al LID %lu: %s\n"
-
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: ha fallat search_record: %s\n"
+#~ msgstr "error al llegir clau prim�ria per al LID %lu: %s\n"
 
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "clau %08lX: la consulta del registre ha fallat\n"
 
 #~ msgid "key %08lX: already in trusted key table\n"
-#~ msgstr "clau %08lX: ja es troba en la taula de claus de confian�a\n"
+#~ msgstr "clau %08lX: ja es troba en la taula de claus de confian�a\n"
 
 #~ msgid "NOTE: secret key %08lX is NOT protected.\n"
-#~ msgstr "NOTE: la clau secreta %08lX no est� protegida.\n"
+#~ msgstr "NOTE: la clau secreta %08lX no est� protegida.\n"
 
 #~ msgid "key %08lX: secret and public key don't match\n"
-#~ msgstr "clau %08lX: les claus p�blica i secreta no coincideixen\n"
-
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "no s'ha pogut enumerar les claus secretes: %s\n"
+#~ msgstr "clau %08lX: les claus p�blica i secreta no coincideixen\n"
 
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
-#~ msgstr "clau %08lX.%lu: Enlla� de subclau correcta\n"
+#~ msgstr "clau %08lX.%lu: Enlla� de subclau correcta\n"
 
 #~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-#~ msgstr "clau %08lX.%lu: Enlla� de subclau inv�lid: %s\n"
+#~ msgstr "clau %08lX.%lu: Enlla� de subclau inv�lid: %s\n"
 
 #~ msgid "key %08lX.%lu: Valid key revocation\n"
-#~ msgstr "clau %08lX.%lu: Revocaci� de clau v�lida\n"
+#~ msgstr "clau %08lX.%lu: Revocaci� de clau v�lida\n"
 
 #~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-#~ msgstr "clau %08lX.%lu: Revocaci� de clau inv�lida: %s\n"
+#~ msgstr "clau %08lX.%lu: Revocaci� de clau inv�lida: %s\n"
 
 #~ msgid "Good self-signature"
 #~ msgstr "Auto-signatura correcta"
 
 #~ msgid "Invalid self-signature"
-#~ msgstr "Auto-signatura inv�lida"
+#~ msgstr "Auto-signatura inv�lida"
 
 #~ msgid "Valid user ID revocation skipped due to a newer self signature"
 #~ msgstr ""
-#~ "Revocaci� d'ID d'usuari v�lida ignorada degut a una auto-signatura m�s "
-#~ "recent"
+#~ "Es descarta una revocaci� d'ID d'usuari v�lida degut a una "
+#~ "autosignatura m�s recent"
 
 #~ msgid "Valid user ID revocation"
-#~ msgstr "Revocaci� d'ID d'usuari v�lida"
+#~ msgstr "Revocaci� d'ID d'usuari v�lida"
 
 #~ msgid "Invalid user ID revocation"
-#~ msgstr "Revocaci� d'ID d'usuari inv�lida"
+#~ msgstr "Revocaci� d'ID d'usuari inv�lida"
 
 #~ msgid "Valid certificate revocation"
-#~ msgstr "Certificat de revocaci� v�lid"
+#~ msgstr "Certificat de revocaci� v�lid"
 
 #~ msgid "Good certificate"
 #~ msgstr "Certificat correcte"
 
 #~ msgid "Invalid certificate revocation"
-#~ msgstr "Certificat de revocaci� inv�lid"
+#~ msgstr "Certificat de revocaci� inv�lid"
 
 #~ msgid "Invalid certificate"
-#~ msgstr "Certificat inv�lid"
+#~ msgstr "Certificat inv�lid"
 
 #~ msgid "sig record %lu[%d] points to wrong record.\n"
 #~ msgstr "el registre de signatura %lu[%d] apunta a un registre incorrecte.\n"
@@ -4856,17 +6194,14 @@ msgstr "%s: anell creat\n"
 #~ msgstr "tdbio_search_dir ha fallat: %s\n"
 
 #~ msgid "lid ?: insert failed: %s\n"
-#~ msgstr "lid ?: la inserci� ha fallat: %s\n"
+#~ msgstr "lid ?: la inserci� ha fallat: %s\n"
 
 #~ msgid "lid %lu: insert failed: %s\n"
-#~ msgstr "lid %lu: la inserci� ha fallat: %s\n"
+#~ msgstr "lid %lu: la inserci� ha fallat: %s\n"
 
 #~ msgid "lid %lu: inserted\n"
 #~ msgstr "lid %lu: inserit\n"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "error al llegir el registre de directori: %s\n"
-
 #~ msgid "\t%lu keys with errors\n"
 #~ msgstr "\t%lu claus amb errors\n"
 
@@ -4874,13 +6209,13 @@ msgstr "%s: anell creat\n"
 #~ msgstr "\t%lu claus inserides\n"
 
 #~ msgid "lid %lu: dir record w/o key - skipped\n"
-#~ msgstr "lid %lu: registre de directori sense clau - ignorat\n"
+#~ msgstr "lid %lu: registre de directori sense clau - es descarta\n"
 
 #~ msgid "\t%lu due to new pubkeys\n"
-#~ msgstr "\\t%lu degut a noves claus p�bliques\n"
+#~ msgstr "\\t%lu degut a noves claus p�bliques\n"
 
 #~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu claus ignorades\n"
+#~ msgstr "\t%lu claus es descarta\n"
 
 #~ msgid "\t%lu keys updated\n"
 #~ msgstr "\t%lu clau actualitzades\n"
@@ -4896,10 +6231,11 @@ msgstr "%s: anell creat\n"
 
 #~ msgid "key %08lX: insert trust record failed: %s\n"
 #~ msgstr ""
-#~ "clau %08lX: ha fallat la inserci� en la base de dades de confian�a: %s\n"
+#~ "clau %08lX: ha fallat la inserci� en la base de dades de confian�a: %"
+#~ "s\n"
 
 #~ msgid "key %08lX.%lu: inserted into trustdb\n"
-#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confian�a\n"
+#~ msgstr "clau %08lX.%lu: inserida en la base de dades de confian�a\n"
 
 #~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 #~ msgstr ""
@@ -4910,26 +6246,30 @@ msgstr "%s: anell creat\n"
 #~ msgstr "clau %08lX.%lu: caducada el %s\n"
 
 #~ msgid "key %08lX.%lu: trust check failed: %s\n"
-#~ msgstr "clau %08lX.%lu: ha fallat la verificaci� de confian�a: %s\n"
+#~ msgstr "clau %08lX.%lu: ha fallat la verificaci� de confian�a: %s\n"
 
 #~ msgid "problem finding '%s' in trustdb: %s\n"
-#~ msgstr "problema al cercar �%s� en la base de dades de confian�a: %s\n"
+#~ msgstr ""
+#~ "problema al cercar �%s� en la base de dades de confian�a: %s\n"
 
 #~ msgid "user '%s' not in trustdb - inserting\n"
 #~ msgstr ""
-#~ "l'usuari �%s� no est� en la base de dades de confian�a - inserint-lo\n"
+#~ "l'usuari �%s� no est� en la base de dades de confian�a - inserint-"
+#~ "lo\n"
 
 #~ msgid "failed to put '%s' into trustdb: %s\n"
-#~ msgstr "no s'ha pogut posar �%s� en la base de dades de confian�a - %s\n"
+#~ msgstr ""
+#~ "no s'ha pogut posar �%s� en la base de dades de confian�a - %s\n"
 
 #~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr "AV�S: encara no es poden manejar registres de pref�ncies llargs\n"
+#~ msgstr ""
+#~ "AV�S: encara no es poden manejar registres de pref�ncies llargs\n"
 
 #~ msgid "%s: can't create keyring: %s\n"
 #~ msgstr "%s: no s'ha creat l'anell: %s\n"
 
 #~ msgid "RSA key cannot be used in this version\n"
-#~ msgstr "No es poden usar claus RSA en aquesta versi�\n"
+#~ msgstr "No es poden usar claus RSA en aquesta versi�\n"
 
 #~ msgid "No key for user ID\n"
 #~ msgstr "No hi ha clau per a l'usuari\n"
@@ -4938,7 +6278,7 @@ msgstr "%s: anell creat\n"
 #~ msgstr "No hi ha usuari per a la clau\n"
 
 #~ msgid "invalid"
-#~ msgstr "inv�lida"
+#~ msgstr "inv�lida"
 
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "no hi ha clau secreta disponible per al desxifratge\n"
diff --git a/po/cs.po b/po/cs.po
index d77d6f385..ff114b620 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,58 +1,75 @@
 # GnuPG Czech translation
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-# Magda Proch�zkov� <[email protected]>, Roman Pavlik <[email protected]> 2001, 2002.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Magda Proch�zkov� <[email protected]> 2001, Roman Pavlik <[email protected]> 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-04-20 10:20+0200\n"
+"Project-Id-Version: gnupg-1.2.3\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-12-07 16:20+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROV�N�: Pou��van� pam� nen� bezpe�n�!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ano"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "aAyY"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "ukon�it"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "uUqQ"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "obecn� chyba"
@@ -143,7 +160,7 @@ msgstr "chyba p�i z�pisu souboru"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "nezn�m� kompresn� algoritmus"
+msgstr "nezn�m� komprima�n� algoritmus"
 
 #: util/errors.c:77
 msgid "file open error"
@@ -249,7 +266,6 @@ msgstr "neza�ifrov�no"
 msgid "not processed"
 msgstr "nezpracov�no"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "nepou�iteln� ve�ejn� kl��"
@@ -262,73 +278,80 @@ msgstr "nepou�iteln� tajn� kl��"
 msgid "keyserver error"
 msgstr "chyba serveru kl���"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "varov�n�: neplatn� velikost random_seed - soubor nepou�it\n"
+msgstr "VAROV�N�: neplatn� velikost random_seed - soubor nepou�it\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu ��st `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zav��t `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -353,7 +376,31 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "hashovac� algoritmus `%s' je v tomto release read-only\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Pros�m �ekejte, je nutn� z�skat dostatek entropie. Aby jste se nenudili,\n"
+"m��ete na po��ta�i d�lat n�co jin�ho, zv���te tak kvalitu entropie.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -361,169 +408,128 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[soubor]|�ifrovat soubor"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "pouze ulo�en�"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[soubor]|de�ifrovat soubor"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "zkontrolovat podpisy kl���"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "podepsat kl�� bez mo�nosti revokace podpisu"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr ""
-"podepsat kl�� lok�ln� a bez mo�nosti\n"
-" revokace podpisu"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "vypsat pouze po�ad� paket�"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
+#: g10/g10.c:397
+msgid "change data on a card"
 msgstr ""
-"exportovat hodnoty d�v�ryhodnosti\n"
-" vlastn�ka kl��e"
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
+#: g10/g10.c:398
+msgid "change a card's PIN"
 msgstr ""
-"importovat hodnoty d�v�ryhodnosti\n"
-" vlastn�ka kl��e"
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "neinteraktivn� aktualizace datab�ze d�v�ry"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "opravit naru�enou datab�zi d�v�ry"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "Dek�dovat ASCII soubor nebo std. vstup"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "Zak�dovat soubor nebo std. vstup do ASCII"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
-msgstr "|algo [soubory]|vypi� hash"
+msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -533,213 +539,59 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|JM�NO|pou��t JM�NO jako implicitn�ho adres�ta"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr ""
-"pou��t implicitn� kl�� jako implicitn�ho\n"
-" adres�ta"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 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:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "b�t o trochu v�c tich�"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "v�bec nepou��vat termin�l"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "vynutit podpisy verze 3"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "nevynucovat podpisy verze 3"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "vynutit podpisy verze 4"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "nevynucovat podpisy verze 4"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "pro �ifrov�n� v�dy pou��t MDC"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "pro �ifrov�n� nikdy nepou��t MDC"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
+msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "pou�ijte gpg-agenta"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "d�vkov� re�im: nikdy se na nic neptat"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "automaticky odpov�d�t ANO na v�t�inu ot�zek"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "automaticky odpov�d�t NE na v�t�inu ot�zek"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"p�idat tento soubor kl��� do seznamu\n"
-" pou��van�ch soubor� kl���"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "p�idat tento soubor tajn�ch kl��� do seznamu"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "uka� ve kter�m souboru kl��� je vypsan� kl��"
 
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|JM�NO|pou�ij JM�NO jako implicitn� tajn� kl��"
-
-#: g10/g10.c:416
-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:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|JM�NO|nastav znakovou sadu termin�lu na JM�NO"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "��st nastaven� ze souboru"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|zapsat informace o stavu do tohoto FD"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[SOUBOR]|zapi� informaci o stavu do SOUBORu"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|KL��|�pln� d�v��ovat tomuto kl��i"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|SOUBOR|nahr�t roz�i�uj�c� modul SOUBOR"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emulovat m�d popsan� v RFC1991"
-
-#: g10/g10.c:442
-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:443
-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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|pou��t m�d hesla N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|ALG|pou��t hashovac� algoritmus ALG pro hesla"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|ALG|pou��t �ifrovac� algoritmus ALG pro hesla"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|ALG|pou��t �ifrovac� algoritmus ALG"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|ALG|pou��t hashovac� algoritmus ALG"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|pou��t kompresn� algoritmus N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
-"zahodit identifik�tor kl��e z �ifrovan�ch\n"
-" paket�"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Zobrazit fotografick� ID"
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "Nezobrazovat fotografick� ID"
-
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
-"Nastavit p��kazov� ��dek k prohl��en�\n"
-" fotografick�ho ID"
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -747,7 +599,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -765,17 +617,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -785,7 +637,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -793,448 +645,660 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Ve�ejn� kl��: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "�ifra: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Komprese: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "no = podpis nalezen v definici skupiny \"%s\"\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1166
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1169
 #, fuzzy, 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"
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1172
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
+
+#: g10/g10.c:1181
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1184
 #, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr ""
+"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr ""
+"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr ""
+"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
+
+# c-format
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
+msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, 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:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
+"�ifra \"%s\" nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
+"bezpe�n�\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nen� platn� znakov� sada\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "VAROV�N�: pou��v�n� paralteru %s se nedoporu�uje.\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "neplatn� parametr pro export\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: neplatn� parametr pro import\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "neplatn� zp�sob reprezentace v ASCII"
+msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "VAROV�N�: pou��v�n� paralteru %s se nedoporu�uje.\n"
+msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "neplatn� soubor kl���"
+msgstr "neplatn� parametr pro export\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "neplatn� parametr pro import\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: neplatn� parametr pro export\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "neplatn� parametr pro export\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, 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:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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:1737
+#: g10/g10.c:2441
 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:1743
+#: g10/g10.c:2447
 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:1756
+#: g10/g10.c:2460
 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:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "tato zpr�va nen� pro PGP 2.x pou�iteln�\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
+
+#: g10/g10.c:2546
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1845
-#, 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:1847
+#: g10/g10.c:2561
 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:1849
+#: g10/g10.c:2563
 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:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr ""
+"neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
+"2 nebo 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr ""
+"neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
+"nebo 3\n"
+
+#: g10/g10.c:2572
 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:1858
+#: g10/g10.c:2576
 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:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "neplatn� p�edvolby \n"
+msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "neplatn� p�edvolby \n"
+msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "neplatn� p�edvolby \n"
+msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "neplatn� p�edvolby \n"
+msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s dosud nen� funk�n� s %s\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "pou�it� �ifrovac�ho algoritmu \"%s\" v m�du %s dovoleno\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "pou�it� hashovac�ho algoritmu \"%s\" v m�du %s dovoleno\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "pou�it� komprima�n�ho algoritmu \"%s\" v m�du %s dovoleno\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [jm�no souboru]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [jm�no souboru]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u�ivatele"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u�ivatele"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nelze otev��t %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 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:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "export kl��e se nepoda�il: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "refresh dat na keyserveru se nezda�il: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
+"a mus� kon�it znakem '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
+
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/g10.c:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "b�t o trochu v�c tich�"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "ber kl��e z t�to kl��enky (keyringu)"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|zapsat informace o stavu do tohoto FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Syntaxe: gpg [volby] [souboru]\n"
+"Ov��� podpisy proti zn�m�m, d�v�ryhodn�m kl���m\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII k�dov�n�: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dov�n�: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �iteln�m form�tu\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "vno�en� podpisy v �iteln�m form�tu\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "neo�ek�van� k�dov�n� ASCII:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatn� znak form�tu radix64 %02x byl p�esko�en\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "chyba v pati�ce\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dov�n� - pravd�podobn� byl pou�it "
 "�patn� MTA\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "D�vod nebyl specifikov�n"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "Kl�� je nahrazen"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Kl�� byl zkompromitov�n"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "Kl�� se ji� nepou��v�"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u�ivatele ji� neplat�"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "D�vod pro revokaci: "
+msgstr "d�vod pro revokaci: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Revoka�n� pozn�mka: "
+msgstr "revoka�n� pozn�mka: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
-msgstr "iImMuUqQsS"
+msgstr "iImMuUsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "K nen� p�i�azena ��dn� hodnota d�v�ry:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1246,188 +1310,208 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = Nev�m\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = Ned�v��uji\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = D�v��uji absolutn�\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = pros�m o v�ce informac�\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = zp�t do hlavn�ho menu\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = p�esko�it tento kl��\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " u = ukon�it\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Opravdu chcete nastavit pro tento kl�� absolutn� d�v�ru? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty vedouc� k fin�ln�mu d�v�ryhodn�mu kl��i:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "kl�� %08lX: kl�� byl revokov�n\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Pou��t p�esto tento kl��? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "kl�� %08lX: podkl�� byl revokov�n!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: skon�ila platnost kl��e\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NEd�v��ujeme tomuto kl��i!\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Nen� jist�, zda tento podpis pat�� vlastn�kovi, p�esto je akceptov�n\n"
+"%08lX: Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Tento kl�� pravd�podobn� n�le�� jeho majiteli\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Tento kl�� n�le�� n�m (m�me odpov�daj�c� tajn� kl��)\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"NEN� jist�, zda tento kl�� pat�� osob�, kter� se vyd�v� za jeho\n"
-"vlastn�ka. Pokud *skute�n�* v�te, co d�l�te, m��ete na ot�zku\n"
-"odpov�d�t ano\n"
+"NEN� jist�, zda tento kl�� pat�� osob�, jej�� jm�no je uvedeno\n"
+"v u�ivatelsk�m ID. Pokud *skute�n�* v�te, co d�l�te, m��ete na\n"
+"n�sleduj�c� ot�zku odpov�d�t ano\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VAROV�N�: Je pou�it ned�v�ryhodn� kl��!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "VAROV�N�: tento kl�� m��e b�t revokov�n (revoka�n� kl�� nenalezen)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         To m��e znamenat, �e podpis je pad�lan�.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento podkl�� byl revokov�n sv�m vlastn�kem!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento kl�� byl ozna�en jako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnost tohoto kl��e!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROV�N�: Tento kl�� nen� certifikov�n d�v�ryhodn�m podpisem!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROV�N�: NEd�v��ujeme tomuto kl��i!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravd�podobn� PAD�LAN�.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROV�N�: Tento kl�� nen� certifikov�n dostate�n� d�v�ryhodn�mi podpisy!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, 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:811
+#: g10/pkclist.c:829
 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1435,131 +1519,126 @@ msgstr ""
 "\n"
 "Napi�te identifik�tor u�ivatele (user ID). Ukon�ete pr�zdn�m ��dkem: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Takov� identifik�tor u�ivatele neexistuje.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 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:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Ve�ejn� kl�� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nezn�m� implicitn� adres�t `%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, 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:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
-#: 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:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "duplicita p�edvolby %c%lu\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "p��li� mnoho `%c' p�edvoleb\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "neplatn� znak v �et�zci s p�edvolbami\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "p��li� mnoho `%c' p�edvoleb\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "p��li� mnoho `%c' p�edvoleb\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "neplatn� znak v �et�zci s p�edvolbami\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "zapisuji podpis kl��e sebou sam�m\n"
+msgstr "zapisuji podpis kl��e j�m sam�m (direct signature)\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: 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:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (pro �ifrov�n� a podpis)\n"
+msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1572,39 +1651,31 @@ msgstr ""
 "                      implicitn� velikost kl��e je 1024 bit�\n"
 "             nejvy��� navrhovan� velikost kl��e je 2048 bit�\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Jakou velikost kl��e si p�ejete? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 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:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 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"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1612,11 +1683,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:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Opravdu chcete vytvo�it kl�� t�to d�lky? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1624,17 +1695,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1650,7 +1721,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:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1666,30 +1737,29 @@ 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:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Podpis je platn� pro? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "platnost %s skon�� %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1697,11 +1767,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Je to spr�vn� (a/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1717,44 +1787,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1765,29 +1835,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1795,16 +1865,16 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1816,7 +1886,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1829,53 +1899,58 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "nelze prov�st v d�vkov�m m�du\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "P�r kl��� DSA bude dlouh� 1024 bit�.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "zapisuji tajn� kl�� do `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, 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:2232
+#: g10/keygen.c:2596
 #, 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:2252
+#: g10/keygen.c:2619
 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:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "kl�� ozna�en jako absolutn� d�v�ryhodn�.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1883,12 +1958,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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1896,7 +1971,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:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1904,557 +1979,637 @@ 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:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Opravdu vytvo�it? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nemohu otev��t: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "v m�du S2K nelze pou��t symetrick� ESK paket\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "pou�it� �ifry: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
-msgstr "`%s' je ji� zakomprimov�n\n"
+msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VAROV�N�: soubor je pr�zdn�\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�tu z `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
+msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, 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:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
+msgstr ""
+"vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "kl�� `%s' nenalezen: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: g10/export.c:222
-#, 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:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %08lX: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %08lX: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "VAROV�N�: tajn� kl�� %08lX nen� chr�n�n pomoc� simple SK checksum\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
-msgstr "p��li� mnoho polo�ek v bufferu ve�ej�ch kl��� - vypnuto\n"
+msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[User ID not found]"
 
 # c-format
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s 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:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %08lX - ignorov�no\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "pou��v�m sekund�rn� kl�� %08lX m�sto prim�rn�ho kl��e %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %08lX: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identifik�tor� (user ID): %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importov�no: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             beze zm�n: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nov� id u�ivatel� (user ID): %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nov� podkl��e: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nov� podpisy: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nov� revokace kl���: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "              importov�no: %lu"
+msgstr "           neimportov�no: %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:576
 #, c-format
-msgid "key %08lX: no user ID\n"
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "podpis %s, hashovac� algoritmus %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
 msgstr "kl�� %08lX: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:597
+#: g10/import.c:707
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "kl�� %08lX: neexistuje podkl�� pro v�z�n� kl���\n"
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "kl�� %08lX: HKP po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:612
-#, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: 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:619
-#, c-format
-msgid "key %08lX: no valid user IDs\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %08lX: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 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:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %08lX: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "kl�� %08lX: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "kl�� %08lX: ve�ejn� kl�� importov�n\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "kl�� %08lX: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %08lX: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %08lX: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %08lX: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "kl�� %08lX: 1 nov� identifik�tor u�ivatele\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "kl�� %08lX: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "kl�� %08lX: %d nov�ch identifik�tor� u�ivatele\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "kl�� %08lX: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "kl�� %08lX: 1 nov� podpis\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "kl�� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "kl�� %08lX: %d nov�ch podpis�\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "kl�� %08lX: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "kl�� %08lX: 1 nov� podkl��\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "kl�� %08lX: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "kl�� %08lX: \"%s\" %d nov�ch podkl���\n"
+
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "kl�� %08lX: %d nov�ch podkl���\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "kl�� %08lX: \"%s\" beze zm�n\n"
 
-#: g10/import.c:774
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "kl�� %08lX: beze zm�n\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "kl�� %08lX: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "kl�� %08lX: tajn� kl�� importov�n\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %08lX: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %08lX: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %08lX: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "kl�� %08lX: revoka�n� certifik�t importov�n\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "kl�� %08lX: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %08lX: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: 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:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: 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:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %08lX: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %08lX: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %08lX: neplatn� vazba podkl��e\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "kl�� %08lX: neplatn� vazba podkl��e\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "kl�� %08lX: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "kl�� %08lX: neexistuje podkl�� pro v�z�n� kl���\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "kl�� %08lX: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "kl�� %08lX: neplatn� vazba podkl��e\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "kl�� %08lX: neplatn� revoka�n� podkl��\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "kl�� %08lX: neplatn� vazba podkl��e\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "kl�� %08lX: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "kl�� %08lX: identifik�tor u�ivatele p�esko�en '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "kl�� %08lX: podkl�� p�esko�en\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "kl�� %08lX: podpis nen� exportovateln� (t��da %02x) - p�esko�eno\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: 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:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %08lX: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "kl�� %08lX: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "kl�� %08lX: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "kl�� %08lX: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %08lX: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1698
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"VAROV�N�: kl�� %08lX m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %"
-"08lX\n"
+"VAROV�N�: kl�� %08lX m��e b�t revokov�n: zkou��m z�skat revoka�n�kl�� %08lX\n"
 
-#: g10/import.c:1403
+#: g10/import.c:1711
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROV�N�: kl�� %08lX m��e b�t revokov�n: revoka�n� kl�� %08lX nenalezen.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "kl�� %08lX: p�id�n revoka�n� certifik�t\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "kl�� %08lX: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "kl�� %08lX: podpis kl��e j�m sam�m (direct key signature)\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, 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:231
+#: g10/keyedit.c:249
 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:233
+#: g10/keyedit.c:251
 #, 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:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = D�v��uji ��ste�n�\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = D�v��uji �pln�\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 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) "
+msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
+
+#: g10/keyedit.c:584
+#, 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"
+"Podpis kl��e \"%s\" j�m sam�m je\n"
+"podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 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) "
+msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Platnost Va�eho podpisu na \"%s\"\n"
+"vypr�ela.\n"
+"\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
+"N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2464,50 +2619,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 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:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %08lX\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 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:535
+#: g10/keyedit.c:759
 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:537
+#: g10/keyedit.c:761
 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:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2517,27 +2676,31 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr "   (2) ��se�n� jsem to ov��il(a).%s\n"
+msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, 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:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Va� v�b�r? (pro detailn�j�� informace stiskn�t� '?'):"
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2545,42 +2708,39 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 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"
+msgstr ""
+"\n"
+"Jedn� se o podpis kl��e j�m sam�m\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"Podpis bude ozna�en jako neexportovateln�.\n"
-"\n"
+"VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
+"VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en jako neexportovateln�.\n"
-"\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2588,7 +2748,7 @@ msgstr ""
 "\n"
 "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2596,7 +2756,7 @@ msgstr ""
 "\n"
 "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2604,7 +2764,7 @@ msgstr ""
 "\n"
 "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2612,33 +2772,34 @@ msgstr ""
 "\n"
 "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Skute�n� podepsat? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2646,7 +2807,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2654,470 +2815,568 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Opravdu to chcete ud�lat? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 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:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "u"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "ulo�it"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "vypsat fingerprint"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "vyberte sekund�rn� kl�� N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "vypsat seznam podpis�"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "podepsat kl��"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "vytvo�it podpis odd�len� od dokumentu"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "podepsat kl�� bez mo�nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "podepsat kl�� lok�ln� a  bez mo�nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "smazat identifik�tor u�ivatele"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "p�idat sekund�rn� kl��"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "smazat sekund�rn� kl��"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "addkey"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "p�idat sekund�rn� kl��"
+msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "smazat podpisy"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "zm�nit dobu platnosti"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "ozna�it u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 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:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "nastavit seznam p�edvoleb"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "aktualizovat p�edvolby"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "chyba serveru kl���"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "odvolat platnost id u�ivatele"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revokovat sekund�rn� kl��"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "uk�zat fotografick� ID"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, 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:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Opravdu podepsat v�echny id u�ivatele? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, 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:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Opravdu odstranit tento id u�ivatele? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Opravdu chcete smazat vybran� kl��e? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Opravdu chcete smazat tento kl��? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Opravdu odstranit tento id u�ivatele? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Opravdu chcete revokovat vybran� kl��e? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Opravdu chcete revokovat tento kl��? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "nastavit seznam p�edvoleb"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Opravdu aktualizovat p�edvoleby pro vybran� id u�ivatele? "
+msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Opravdu aktualizovat p�edvolby? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Ulo�it zm�ny? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Ukon�it bez ulo�en�? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 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:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Hash: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Vlastnosti: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, 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"
+msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr "(citliv� informace)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "%s: nemohu vytvo�it: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revokov�n] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [platnost skon��: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [platnost skon��: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr "d�v�ra: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! podkl�� byl revokov�n: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- nalezena pad�lan� revokace\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probl�m ov��en� revokace: %s\n"
 
-#: g10/keyedit.c:1837
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revokov�n] "
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 #, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
+
+#: g10/keyedit.c:2207
 msgid ""
 "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"
+"b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revokov�n] "
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[expirov�n] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
+"              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3126,488 +3385,623 @@ 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:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 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:2012
+#: g10/keyedit.c:2410
 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:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
-msgstr "Nic nebylo smazn�no.\n"
+msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
+"          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Vlo�te d�lku kl��e"
+msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
+"VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N): "
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2849
 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:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
 msgstr ""
-"kl�� %08lX: neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekund�rn� kl�� s indexem %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "id u�ivatele: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "podeps�no Va��m kl��em %08lX v %s\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "lok�ln� podeps�no Va��m kl��em %08lX v %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 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:2931
+#: g10/keyedit.c:3512
 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   podeps�no %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   revokov�no %08lX v %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   podeps�no %08lX v %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
-msgstr " (nexeportovateln�)"
+msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Podepisovac� politika: "
+msgstr "Kritick� podepisovac� politika: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Podepisovac� politika: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
-msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu datumu\n"
+msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Podepisovac� notace: "
+msgstr "Kritick� podepisovac� notace: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [platnost skon��: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [platnost skon��: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revokov�n] "
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "vypsat seznam kl��� a fingerprint�"
+msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "   Fingerprint kl��e ="
+msgstr "     Fingerprint podkl��e:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "   Fingerprint kl��e ="
+msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "   Fingerprint kl��e ="
+msgstr "      Fingerprint podkl��e:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "   Fingerprint kl��e ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "neplatn� hashovac� algoritmus `%s'\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "neplatn� heslo nebo nezn�m� �ifrovac� algoritmus (%d)\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s za�ifrovan� kl�� sezen�\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 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:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, 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:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "de�ifrov�n� ve�en�m kl��em selhalo: %s\n"
+msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "za�ifrov�no s heslem %lu\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "za�ifrov�no jedn�m heslem\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "VAROV�N�: zpr�va nebyla chr�n�na proti poru�en� jej� integrity\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 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:780
-msgid "Notation: "
-msgstr "Notace: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Politika: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Platnost podpisu skon�ila %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                alias \""
+
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1310
-#, 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:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Podpis vytvo�en %.*s pomoc� kl��e %s s ID u�ivatele %08lX\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Kl�� k dispozici na: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "�PATN� podpis od \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Podpis s vypr�enou platnost� od \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[nejist�]  "
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Platnost podpisu skon�ila %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Platnost podpisu skon�� %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "podpis %s, hashovac� algoritmus %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "bin�rn� form�t"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "textov� form�t"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "nezn�m� form�t"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "VAROV�N�: detekov�no v�ce podpis�. Kontrolov�n bude pouze prvn�.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experiment�ln� algoritmy by se nem�ly pou��vat!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "tento �ifrovac� algoritmus se nedoporu�uje; pros�m, pou�ijte n�jak� "
 "standardn�j��!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "VAROV�N�: pou��v�n� paralteru %s se nedoporu�uje.\n"
+msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VAROV�N�: pou��v�n� paralteru %s se nedoporu�uje.\n"
+msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "pu��jte m�sto n�j \"--keyserver-options %s\" \n"
+msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Nezakomprimov�no"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Nezakomprimov�no"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "�tu mo�nosti z `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "nezn�m� implicitn� adres�t `%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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
-msgstr "nemohu nastavit PID clienta pro gpg-agenta\n"
+msgstr "nemohu nastavit PID klienta pro gpg-agenta\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "nelze z�skat server read file descriptor pro agenta r\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "nezle z�skat server write file descriptor pro agenta\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunikaci s gpg-agentem\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hlavn� ID kl��e %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3618,32 +4012,40 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %08lX, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Vlo�it heslo\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Vlo�it heslo\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "heslo je p��li� dlouh�\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakce od agenta\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Vlo�te heslo: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3653,261 +4055,267 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %08lX, vytvo�en� %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Vlo�te heslo: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (hlavn� ID kl��e %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "data nebyla ulo�ena; k jejich ulo�en� pou�ijte parametr p��kazu \"--output"
 "\"\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; zkou��m tajn� kl�� %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my jsme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dov�n� DEK nen� podporov�no\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, 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:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "POZN�MKA: v p�edvolb�ch nenalezen �ifrovac� algoritmus %d\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnost tajn�ho kl��e %08lX skon�ila %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "kl�� %08lX: kl�� byl revokov�n\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "po�aduji kl�� %08lX z HKP serveru kl��� %s\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "nemohu dostat kl�� ze serveru kl���: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "chyba p�i pos�l�n� na `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "�sp�n� odesl�n� na `%s' (status=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "chyba odesl�n� na `%s': (status=%u)\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "vyhled�v�m \"%s\" na HKP serveru %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "nemohu prohled�vat server kl���: %s\n"
+msgstr "POZN�MKA: kl�� byl revokov�n"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, zkuste to znovu"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROV�N�: Objeven slab� kl�� - zm��te, pros�m, znovu heslo.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generuji _nevhodn�_ 16-ti bitov� kontroln� sou�et pro ochranu soukrom�ho "
 "kl��e\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
-msgstr ""
+msgstr "VAROV�N�: konflikt hashe podpisu ve zpr�v�\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:99
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "VAROV�N�: podepisovac� podkl�� %08lX nen� k���ov� certifikov�n\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"toto je kl�� algoritmu ElGamal vygenerovan� v PGP - podpisy j�m vytvo�en� "
-"NEJSOU bezpe�n�!\n"
+"VAROV�N�: podepisovac� podkl�� %08lX m� neplatnou k���ovou certifikaci\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "ve�ejn� kl�� je o %lu sekund nov�j�� ne� podpis\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "ve�ejn� kl�� %08lX je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "ve�ejn� kl�� je o %lu sekund nov�j�� ne� podpis\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "ve�ejn� kl�� %08lX je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 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/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 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/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "POZN�MKA: podpisov�mu kl��i %08lX skon�ila platnost %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"p�edpokl�d�m �patn� podpis kl��em %08lX, proto�e je nastaven nezn�m� "
+"kritick� bit\n"
+
+#: g10/sig-check.c:532
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "p�edpokl�d�m �patn� podpis, proto�e je nastaven nezn�m� kritick� bit\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "kl�� %08lX: neexistuje podkl�� pro revokaci podkl��e\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:558
 #, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "kl�� %08lX: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"notaci (notation) nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "notaci (notation) nelze ulo�it jako v3 podpis kl��e (form�t PGP 2.x)\n"
+
+#: g10/sign.c:112
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
+"VAROV�N�: nelze %%-expandovat notaci (p��li� dlouh�). Pou�ity "
+"neexpandovan�.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "URL politiky nelze ulo�it ve form�tu v3 podpisu (form�t PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "nelze ulo�it URL politiky do podpisu v3 kl��em (form�t PGP 2.x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (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
+#: g10/sign.c:187
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "%s podpis od: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 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"
+msgstr ""
+"v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
+"form�tu PGP-2.x\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: nemohu vytvo�it: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "POZN�MKA: v p�edvolb�ch nenalezen �ifrovac� algoritmus %d\n"
+msgstr "vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -3922,12 +4330,12 @@ msgstr "nemohu pracovat s ��dky del��mi ne� %d znak�\n"
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: lseek() se nepoda�il: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: z�pis se nepoda�il (n=%d): %s\n"
@@ -3936,195 +4344,265 @@ msgstr "z�znam v datab�zi d�v�ry %lu: z�pis se nepoda�il (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transakce s datab�z� d�v�ry je p��li� dlouh�\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: nemohu p�istoupit k: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�� neexistuje!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: nemohu vytvo�it z�mek\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: nemohu zamknout\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nemohu vytvo�it: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepoda�ilo se vytvo�it z�znam verze: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvo�ena neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: datab�ze d�v�ry vytvo�ena\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "POZN�MKA: do trustedb nezle zapisovat\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatn� datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba p�i aktualizaci z�znamu verze: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba p�i �ten� z�znamu verze: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba p�i z�pisu z�znamu verze: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�v�ry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�ze d�v�ry: procedura read() (n=%d) selhala: %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nen� soubor datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verze s ��slem %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verze souboru %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: chyba pri �ten� voln�ho z�znamu: %s\n"
+msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulov�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nen� platn� dlouh� keyID\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "kl�� %08lX: akceptov�n jako d�v�ryhodn� kl��\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kl�� %08lX se v datab�zi d�v�ry vyskytuje v�ce ne� jednou\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "kl�� %08lX: nenalezen ve�ejn� kl�� k d�v�ryhodn�mu kl��i - p�esko�eno\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "kl�� ozna�en jako absolutn� d�v�ryhodn�.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ po�. %d: �ten� selhalo: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�v�ry %lu nen� po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ %d: z�pis selhal: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "nikdy     "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "dal�� kontrolova datab�ze d�v�ry v %s\n"
+msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "ve�ejn� kl�� %08lX nebyl nalezen: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "ve�ejn� kl�� %08lX nebyl nalezen: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i  %08lX nebyl nalezen\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "kontrola v hloubce %d podeps�no=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "z�znam d�v�ry %lu, typ %d: z�pis selhal: %s\n"
 
-#: g10/verify.c:108
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4134,7 +4612,7 @@ msgstr ""
 "Pros�m, nezapome�te, �e soubor s podpisem (.sig nebo .asc)\n"
 "by m�l b�t prvn�m souborem zadan�m na p��kazov� ��dce.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 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"
@@ -4160,15 +4638,14 @@ msgid "skipped: secret key already present\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "p�esko�en `%s': toto je vygenerovan� PGP kl�� podle algoritmu ElGamal,\n"
 "podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4187,26 +4664,31 @@ msgstr "%s: nezn�m� p��pona\n"
 msgid "Enter new filename"
 msgstr "Vlo�te nov� n�zev souboru"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "zapisuji do standardn�ho v�stupu\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "p�edpokl�d�m podepsan� data v `%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: vytvo�en nov� soubor s p�edvolbami\n"
+msgstr "vytvo�en nov� konfigura�n� soubor `%s'\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: nemohu vytvo�it adres��: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: adres�� vytvo�en\n"
@@ -4231,46 +4713,46 @@ msgstr ""
 "nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
 "%d kr�t!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA po�aduje pou�it� 160-ti bitov�ho hashovac�ho algoritmu\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(dokud neur��te kl�� jeho fingerprintem)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "bez parametru \"--yes\" to nemohu v d�vkov�m m�du prov�st\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Smazat tento kl�� ze souboru kl���? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "Toto je tajn� kl��! - opravdu smazat? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "informace o d�v�ryhodnosti vlastn�ka kl��e vymaz�ny\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajn� kl�� pro tento ve�ejn� kl�� \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4281,7 +4763,7 @@ msgstr ""
 "d�v�ry\"; nem� to nic spole�n�ho s (implicitn� vytvo�enou) \"pavu�inou\n"
 "certifik�t�\"."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4293,85 +4775,54 @@ msgstr ""
 "k tajn�m kl���m. Odpov�zte \"ano\", abyste nastavili tyto kl��e\n"
 "jako absolutn� d�v�ryhodn�\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Pokud p�esto chcete pou��t tento revokovan� kl��, odpov�zte \"ano\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Pokud p�esto chcete pou��t tento ned�v�ryhodn� kl��, odpov�zte \"ano\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Vlo�te identifik�tor adres�ta, kter�mu chcete poslat zpr�vu."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Vyberte algoritmus.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"DSA (naz�van� tak� DSS) je algoritmus digit�ln�ho podpisu, kter� m��e b�t\n"
-"pou�it� pouze pro podpisy. Je to doporu�ovan� algoritmus, proto�e ov��en�\n"
-"DSA podpis� je mnohem rychlej�� ne� v algoritmu ElGamal.\n"
-"\n"
-"Algoritmus ElGamal m��e b�t pou��v�n jak pro podpisy tak pro �ifrov�n�.\n"
-"Standard OpenPGP rozli�uje mezi dv�ma re�imy tohoto algoritmu:\n"
-"pouze �ifrov�n� a �ifrov�n�+podpis; v podstat� je to stejn�, ale n�kolik\n"
-"parametr� mus� b�t vybr�no speci�ln�m zp�sobem pro vytvo�en� bezpe�n�ho "
-"kl��e\n"
-"pro podpisy: tento program to um�, ale nen� vy�adov�no, aby i jin�\n"
-"implementace OpenPGP pracovaly v re�imu podpis+�ifrov�n�.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, kter� je schopn� podepisovat;\n"
-"to je d�vod, pro� v tomto menu nen� k dispozi kl�� algoritmu ElGamal\n"
-"ur�n� pouze pro �ifrov�n�."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"A�koli jsou tyto kl��e definov�ny v RFC2440, nejsou doporu�ov�ny,\n"
-"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:98
+#: g10/helptext.c:87
 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 ""
+"Obecn� nelze doporu�it pou��vat stejn� kl�� pro �ifrov�n� a podepisov�n�\n"
+"Tento algoritmus je vhodn� pou��t jen za jist�ch podm�nek.\n"
+"Kontaktujte pros�m nejprve bezpe�nostn�ho specialistu."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Vlo�te d�lku kl��e"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpov�zte \"ano\" nebo \"ne\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4383,19 +4834,19 @@ msgstr ""
 "spr�vnou chybovou hl�ku - m�sto toho syst�m zkus� interpretovat\n"
 "zadanou hodnotu jako interval."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Vlo�te jm�no dr�itele kl��e"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 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:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Pros�m, vlo�te nepovinn� koment��"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4409,11 +4860,11 @@ msgstr ""
 "O  pro pokra�ov�n� generov�n� kl��e.\n"
 "Q  pro ukon�en� generov�n� kl��e."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4486,12 +4937,12 @@ msgstr ""
 "\n"
 "Pokud nev�te, jak� je spr�vn� odpov��, odpov�zte \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4500,11 +4951,11 @@ msgstr ""
 "\".\n"
 "V�echny certifik�ty budou tak� ztraceny!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Odpov�zte \"ano\", pokud chcete smazat podkl��"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4514,7 +4965,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4526,13 +4977,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:225
+#: g10/helptext.c:214
 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:229
+#: g10/helptext.c:218
 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"
@@ -4545,7 +4996,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:237
+#: g10/helptext.c:226
 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"
@@ -4555,25 +5006,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:244
+#: g10/helptext.c:233
 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:250
+#: g10/helptext.c:239
 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)."
+"Pros�m, zopakujte posledn� heslo, abyste si byl(a) jist�(�), co jste \n"
+" napsal(a)."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 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:259
+#: g10/helptext.c:248
 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:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4581,7 +5032,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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4609,7 +5060,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:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4619,98 +5070,639 @@ msgstr ""
 "ceritifik�tu. Pros�m, stru�n�. \n"
 "Text kon�� pr�zdn�m ��dkem.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Pomoc nen� k dispozici"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROV�N�: Existuj� dva soubory s tajn�mi informacemi.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je beze zm�ny\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "kontroluji soubor kl��� (keyring) `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu kl��� ji� zkontrolov�no (%lu podpis�)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu kl��� zkontrolov�n (%lu podpis�)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kl��� zkontrolov�n (%lu podpis�)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
-#, fuzzy
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Vyberte obr�zek, kter� bude pou�it jako Va�e fotografick� ID.  Obr�zek mus�\n"
+"b�t ve form�tu JPEG. Nezapome�t�, �e obr�zek bude ulo�en ve Va�em ve�ejn�m\n"
+"kl��i - velk� obr�zek bude m�t za n�sledek velmi velk� ve�ejn� kl�� !\n"
+"Vhodn� velikost obr�zku je asi 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Vlo�te jm�no JPEG souboru s fotografick�m ID: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Nelze otev��t fotografii \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" nen� soubor ve form�tu JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Je tato fotografie spr�vn� (a/N/u)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "nelze zobrazit photo ID!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "spu�t�n� extern�ho programu nen� podporov�no\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "nemohu vytvo�it adres�� `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"vol�n� extern�ch program� je zak�z�no, proto�e file permissions nejsou\n"
+"nastaveny nebezpe�n�\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"na t�to platform� jsou p�i vol�n� extern�ch program� vy�adov�ny\n"
+"do�asn� soubory (temp files)\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "nelze spustit %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "syst�mov� chyba p�i vol�n� extern�ho programu: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "neo�ek�van� konec extern�ho programu\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "nelze spustit extern� program\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "nelze p�e��st odpov�� extern�ho programu: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "nikdy     "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "kl�� %08lX: chyb� identifik�tor u�ivatele\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Revokov�n:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Toto je citliv� revoka�n� kl��)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "na��zen v�stup do form�tu ASCII.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Revoka�n� certifik�t vytvo�en.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "pro `%s' nebyl nalezen ��dn� revoka�n� kl��\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "tajn� kl�� `%s' nenalezen: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "nezn�m� kompresn� algoritmus\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Revoka�n� certifik�t byl vytvo�en.\n"
+"\n"
+"Pros�m p�eneste jej na m�dium, kter� m��ete dob�e schovat. Pokud se\n"
+"k tomuto certifik�tu dostane nepovolan� osoba, m��e zneplatnit V� kl��.\n"
+"Je rozumn� tento certifik�t vytisknout a schovat jej pro p��pad, �e\n"
+"medium s certifik�tem p�estane b�t �iteln�. Ale pozor: Tiskov� subsyst�m\n"
+"na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
+"jin�m u�ivatel�m!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Pros�m vyberte d�vod revokace:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Zru�it"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "D�vod revokace: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Nebyl zad�n ��dn� popis)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Je d�vod revokace vybr�n spr�vn�? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Seznam p�id�len�ch hodnot d�v�ry, vytvo�en %s\n"
+"# (Pou�ijte \"gpg --import-ownertrust\" k jeho obnov�)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "nelze otev��t soubor: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "��dek je p��li� dlouh�\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "chyba: sch�z� sloupec\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "chyba: neplatn� fingerprint\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "chyba: sch�z� hodnota d�v�ryhodnosti\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "chyba p�i �ten�: %s\n"
+
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
-#~ msgstr "mus�te znovu spustit GnuPG pro op�tovn� na�ten� souboru p�edvoleb\n"
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "VAROV�N�: hash `%s' nen� sou��st� definice OpenPGP.  Pou�it� na vlastn� "
+#~ "nebezpe��!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[soubor]|�ifrovat soubor"
+
+#~ msgid "store only"
+#~ msgstr "pouze ulo�en�"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[soubor]|de�ifrovat soubor"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "podepsat kl�� bez mo�nosti revokace podpisu"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr ""
+#~ "podepsat kl�� lok�ln� a bez mo�nosti\n"
+#~ " revokace podpisu"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "vypsat pouze po�ad� paket�"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr ""
+#~ "exportovat hodnoty d�v�ryhodnosti\n"
+#~ " vlastn�ka kl��e"
+
+#~ msgid "import ownertrust values"
+#~ msgstr ""
+#~ "importovat hodnoty d�v�ryhodnosti\n"
+#~ " vlastn�ka kl��e"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "neinteraktivn� aktualizace datab�ze d�v�ry"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "opravit naru�enou datab�zi d�v�ry"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Dek�dovat ASCII soubor nebo std. vstup"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Zak�dovat soubor nebo std. vstup do ASCII"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|JM�NO|pou��t JM�NO jako implicitn�ho adres�ta"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr ""
+#~ "pou��t implicitn� kl�� jako implicitn�ho\n"
+#~ " adres�ta"
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "zm�na u�ivatelsk�ch opr�vn�n� `%s' selhala: %s\n"
+#~ msgid "don't use the terminal at all"
+#~ msgstr "v�bec nepou��vat termin�l"
 
-#~ msgid "Fingerprint:"
-#~ msgstr "Miniatura (fingerprint):"
+#~ msgid "force v3 signatures"
+#~ msgstr "vynutit podpisy verze 3"
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "             Fingerprint:"
+#~ msgid "do not force v3 signatures"
+#~ msgstr "nevynucovat podpisy verze 3"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|JM�NO=HODNOTA|pou��t tento z�pis dat"
+#~ msgid "force v4 key signatures"
+#~ msgstr "vynutit podpisy verze 4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "nevynucovat podpisy verze 4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "pro �ifrov�n� v�dy pou��t MDC"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "pro �ifrov�n� nikdy nepou��t MDC"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "pou�ijte gpg-agenta"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "d�vkov� re�im: nikdy se na nic neptat"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "automaticky odpov�d�t ANO na v�t�inu ot�zek"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "automaticky odpov�d�t NE na v�t�inu ot�zek"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr ""
+#~ "p�idat tento soubor kl��� do seznamu\n"
+#~ " pou��van�ch soubor� kl���"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "p�idat tento soubor tajn�ch kl��� do seznamu"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "uka� ve kter�m souboru kl��� je vypsan� kl��"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|JM�NO|pou�ij JM�NO jako implicitn� tajn� kl��"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr ""
+#~ "|PO��TA�|pou�ij tento server kl��� pro vyhled�v�n�\n"
+#~ " kl���"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|JM�NO|nastav znakovou sadu termin�lu na JM�NO"
+
+#~ msgid "read options from file"
+#~ msgstr "��st nastaven� ze souboru"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[SOUBOR]|zapi� informaci o stavu do SOUBORu"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KL��|�pln� d�v��ovat tomuto kl��i"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|SOUBOR|nahr�t roz�i�uj�c� modul SOUBOR"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emulovat m�d popsan� v RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "nastav v�echny vlastnosti paket�, �ifer\n"
+#~ " a hash� jako v OpenPGP"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|pou��t m�d hesla N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|ALG|pou��t hashovac� algoritmus ALG pro hesla"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|ALG|pou��t �ifrovac� algoritmus ALG pro hesla"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|ALG|pou��t �ifrovac� algoritmus ALG"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|ALG|pou��t hashovac� algoritmus ALG"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|pou��t komprima�n� algoritmus N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "zahodit identifik�tor kl��e z �ifrovan�ch paket�"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Zobrazit fotografick� ID"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Nezobrazovat fotografick� ID"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Nastavit p��kazov� ��dek k prohl��en� fotografick�ho ID"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "komprima�n� algoritmus `%s' je v tomto release read-only\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "komprima�n� algoritmus mus� b�t v rozmez� %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Nen� jist�, zda tento podpis pat�� vlastn�kovi, p�esto je "
+#~ "akceptov�n\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "p�edvolba %c%lu nen� platn�\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "kl�� %08lX: nen� ve form�tu RFC 2440 - p�esko�eno\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "POZN�MKA: detekov�n prim�rn� kl�� Elgamal - import m��e chvilku trvat\n"
+
+#~ msgid " (default)"
+#~ msgstr " (implicitn�)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  vytvo�en: %s platnost skon��: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Notace: "
+
+#~ msgid "Policy: "
+#~ msgstr "Politika: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "po�aduji kl�� %08lX z %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "nemohu dostat kl�� ze serveru kl���: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "chyba p�i pos�l�n� na `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ 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"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "tento keyserver nepodporuje --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "vyhled�v�m \"%s\" na HKP serveru %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "nemohu prohled�vat server kl���: %s\n"
 
 #~ 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"
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "kl�� %08lX: toto je kl�� algoritmu ElGamal vygenerovan� v PGP - podpisy "
+#~ "j�m vytvo�en� NEJSOU bezpe�n�!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "kl�� %08lX byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu "
+#~ "nebo\n"
+#~ "je probl�m se syst�mov�m �asem)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "kl�� %08lX byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu "
+#~ "nebo\n"
+#~ "je probl�m se syst�mov�m �asem)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "kl�� %08lX ozna�en jako absolutn� d�v�ryhodn�.\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 "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "podpis od podepisovac�ho kl��e Elgamal %08lX na %08lX p�esko�en\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "podpis od %08lX na podepisovac�m kl��i Elgamal %08lX p�esko�en\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "kontrola v hloubce %d podeps�no=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Vyberte algoritmus.\n"
+#~ "\n"
+#~ "DSA (naz�van� tak� DSS) je algoritmus digit�ln�ho podpisu, kter� m��e "
+#~ "b�t\n"
+#~ "pou�it� pouze pro podpisy. Je to doporu�ovan� algoritmus, proto�e "
+#~ "ov��en�\n"
+#~ "DSA podpis� je mnohem rychlej�� ne� v algoritmu ElGamal.\n"
+#~ "\n"
+#~ "Algoritmus ElGamal m��e b�t pou��v�n jak pro podpisy tak pro �ifrov�n�.\n"
+#~ "Standard OpenPGP rozli�uje mezi dv�ma re�imy tohoto algoritmu:\n"
+#~ "pouze �ifrov�n� a �ifrov�n�+podpis; v podstat� je to stejn�, ale n�kolik\n"
+#~ "parametr� mus� b�t vybr�no speci�ln�m zp�sobem pro vytvo�en� bezpe�n�ho "
+#~ "kl��e\n"
+#~ "pro podpisy: tento program to um�, ale nen� vy�adov�no, aby i jin�\n"
+#~ "implementace OpenPGP pracovaly v re�imu podpis+�ifrov�n�.\n"
+#~ "\n"
+#~ "Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, kter� je schopn� podepisovat;\n"
+#~ "to je d�vod, pro� v tomto menu nen� k dispozi kl�� algoritmu ElGamal\n"
+#~ "ur�n� pouze pro �ifrov�n�."
 
 #~ msgid ""
-#~ "WARNING: This key already has a photo ID.\n"
-#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "VAROV�N�: Tento kl�� ji� obsahuje fotografick� ID.\n"
-#~ "         P�id�n� dal�� fotografie m��e zm�st n�kter� verze PGP.\n"
+#~ "A�koli jsou tyto kl��e definov�ny v RFC2440, nejsou doporu�ov�ny,\n"
+#~ "proto�e nejsou podporov�ny v�emi programy a podpisy jimi vytvo�en�\n"
+#~ "jsou zna�n� velk� a pro ov��en� velmi pomal�."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu kl��� ji� zkontrolov�no (%lu podpis�)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "kl�� nen� kopletn�\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"
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "kl�� %08lX nen� kompletn�\n"
diff --git a/po/da.po b/po/da.po
index 5f0cd4e59..7172573d9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,55 +7,73 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2000-03-07 22:51+01:00\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
+#: util/secmem.c:90
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "n"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "afslut"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "aA"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "generel fejl"
@@ -252,7 +270,6 @@ msgstr "ikke krypteret"
 msgid "not processed"
 msgstr "ikke bearbejdet"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 #, fuzzy
 msgid "unusable public key"
@@ -268,72 +285,80 @@ msgstr "d�rlig hemmelig n�gle"
 msgid "keyserver error"
 msgstr "generel fejl"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dette er en fejl (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:401
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -358,7 +383,29 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+
+#: cipher/primegen.c:120
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr ""
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -366,170 +413,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr ""
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "gem kun"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr ""
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:332
-#, fuzzy
-msgid "sign a key non-revocably"
-msgstr "sign�r en n�gle lokalt"
-
-#: g10/g10.c:333
-#, fuzzy
-msgid "sign a key locally and non-revocably"
-msgstr "sign�r en n�gle lokalt"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "vis kun pakkesekvensen"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "eksport�r ejertillidsv�rdierne"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "import�r ejertillidsv�rdierne"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:357
-#, fuzzy
-msgid "unattended trust database update"
-msgstr "opdat�r tillidsdatabasen"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "repar�r en �delagt tillidsdatabase"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "De-beskydt en fil el. stdin"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "Beskydt en fil el. stdin"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -539,207 +548,61 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAME|brug NAME som standard modtager"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "brug standard n�glen som standard modtager"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "v�r mere stille"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "brug overhovedet ikke terminalen"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "tving v3 signaturer"
-
-#: g10/g10.c:397
-#, fuzzy
-msgid "do not force v3 signatures"
-msgstr "tving v3 signaturer"
-
-#: g10/g10.c:398
-#, fuzzy
-msgid "force v4 key signatures"
-msgstr "tving v3 signaturer"
-
-#: g10/g10.c:399
-#, fuzzy
-msgid "do not force v4 key signatures"
-msgstr "tving v3 signaturer"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "brug altid en MDC for kryptering"
-
-#: g10/g10.c:402
-#, fuzzy
-msgid "never use a MDC for encryption"
-msgstr "brug altid en MDC for kryptering"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr ""
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "k�rselsmodus: sp�rg aldrig"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "forvent ja til de fleste spr�gsm�l"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "forvent nej til de fleste spr�gsm�l"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "tilf�j denne n�glering til n�gleringslisten"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "tilf�j denne hemmeligen�glering til listen"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr ""
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|brug NAME som standard hemmelign�gle"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|s�t terminal karakters�t til NAME"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "l�s indstillinger fra fil"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|skriv statusinfo til denne FD"
-
-#: g10/g10.c:427
-#, fuzzy
-msgid "|[file]|write status info to file"
-msgstr "|FD|skriv statusinfo til denne FD"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr ""
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FILE|indl�s udvidelsesmodul FILE"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emul�r modusen beskrevet i RFC1991"
-
-#: g10/g10.c:442
-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:443
-#, 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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|brug pasfrasemodus N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|brug cifferalgoritme NAME"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|brug kompresalgoritme N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr ""
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -759,16 +622,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 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:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -778,7 +641,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -786,421 +649,628 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr ""
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr ""
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr ""
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+#, fuzzy
+msgid "Compression: "
+msgstr "Kommentar: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:983
+#: g10/g10.c:1166
+#, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1169
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1172
+#, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1178
+#, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1181
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1184
+#, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1190
+#, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1193
 #, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:986
+#: g10/g10.c:1196
 #, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:989
+#: g10/g10.c:1202
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:993
+#: g10/g10.c:1205
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
 msgstr ""
 
-#: g10/g10.c:1168
+#: g10/g10.c:1208
+#, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1601
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTITS: %s er ikke til normal brug!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
-msgstr ""
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "ugyldig n�glering"
+
+#: g10/g10.c:2134
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2137
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:1560
+#: g10/g10.c:2144
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:1563
+#: g10/g10.c:2147
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "ugyldig rustning"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "ugyldig n�glering"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTITS: %s er ikke til normal brug!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr ""
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "valgte cifferalgoritme er ugyldig\n"
+
+#: g10/g10.c:2546
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1845
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr ""
-
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
+
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
+
+#: g10/g10.c:2572
 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:1858
+#: g10/g10.c:2576
 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:1862
-#, 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:1868
+#: g10/g10.c:2583
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:1876
+#: g10/g10.c:2592
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:1880
+#: g10/g10.c:2596
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:1884
+#: g10/g10.c:2600
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
+#: g10/g10.c:2633
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s er meningsl�s sammen med %s!\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1977
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [filnavn]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [filnavn]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2908
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: g10/g10.c:3096
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: g10/g10.c:3098
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: g10/g10.c:3109
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "signering fejlede: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr ""
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/g10.c:2691
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+#, fuzzy
+msgid "a user notation name must contain the '@' character\n"
+msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
+
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:2737
+#: g10/g10.c:3712
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "den givne politik-URL er ugyldig\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "v�r mere stille"
+
+#: g10/gpgv.c:68
+#, fuzzy
+msgid "take the keys from this keyring"
+msgstr "Slet denne n�gle fra n�gleringen? "
+
+#: g10/gpgv.c:70
+#, fuzzy
+msgid "make timestamp conflicts only a warning"
+msgstr "tidsstempelkonflikt"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|skriv statusinfo til denne FD"
+
+#: g10/gpgv.c:95
+#, fuzzy
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 #, fuzzy
 msgid "Key is superseded"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -1213,21 +1283,28 @@ msgstr "rev- forkert n�gletilbagekald\n"
 msgid "revocation comment: "
 msgstr ""
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:258
-#, fuzzy, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Ingen tillidsv�rdi tildelt til %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "              alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "              alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1235,107 +1312,111 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:250
 #, c-format
-msgid " %d = Don't know\n"
+msgid " %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, fuzzy, c-format
 msgid " %d = I do NOT trust\n"
 msgstr "%08lX: Vi stoler IKKE p� denne n�gle\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr ""
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr ""
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr ""
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr ""
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = tilbage til hovedmenu\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr ""
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = afslut\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Dit valg? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: n�gle er udl�bet\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:430
 #, fuzzy, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Vi stoler IKKE p� denne n�gle\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
-msgstr ""
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Denne n�gle tilh�rer sikkert ejeren\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Denne n�gle tilh�rer os\n"
 
-#: g10/pkclist.c:513
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -1343,206 +1424,221 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger n�gle uden tillid!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�gle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE p� denne n�gle!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr ""
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 #, 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 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:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr ""
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
-msgstr ""
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:194
-#, fuzzy, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:218
 #, fuzzy
-msgid "invalid character in preference string\n"
+msgid "too many compression preferences\n"
+msgstr "vis pr�ferencer"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:738
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 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:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: 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:949
+#: g10/keygen.c:1171
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
-msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr ""
-
-#: g10/keyedit.c:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1551,62 +1647,54 @@ msgid ""
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 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:1027
+#: g10/keygen.c:1241
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
-#: g10/keygen.c:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 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:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1616,7 +1704,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1626,42 +1714,41 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1671,44 +1758,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1719,28 +1806,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 #, 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1748,17 +1835,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1766,7 +1853,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1774,1498 +1861,1745 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr ""
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, 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:2211
+#: g10/keygen.c:2571
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr ""
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan ikke �bne: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "signering fejlede: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:558 g10/sign.c:758
+#: g10/encode.c:634 g10/sign.c:863
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:703
-#, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr ""
-
-#: g10/encode.c:735
+#: g10/encode.c:818
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/export.c:222
-#, 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:238
+#: g10/export.c:198
 #, fuzzy, c-format
-msgid "key %08lX: not protected - skipped\n"
+msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:246
+#: g10/export.c:206
 #, fuzzy, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1614
 #, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2109
+#: g10/getkey.c:2169
 #, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr ""
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:296
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+msgid "algorithms on these user IDs:\n"
+msgstr ""
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s signatur fra: %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:597
+#: g10/import.c:707
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
+msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:612
+#: g10/import.c:722
 #, fuzzy, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID '%s'\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:619
-#, c-format
-msgid "key %08lX: no valid user IDs\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:636
+#: g10/import.c:746
 #, fuzzy, c-format
-msgid "key %08lX: new key - skipped\n"
+msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:774
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:844
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
+
+#: g10/import.c:1064
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
-msgstr ""
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "hemmelige n�gler import: %lu\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
-msgstr ""
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
-msgstr ""
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr ""
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr ""
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
-msgstr ""
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1030
+#: g10/import.c:1299
 #, fuzzy, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1032
+#: g10/import.c:1301
 #, fuzzy, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
-msgstr ""
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
-msgstr ""
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr ""
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
-#, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr ""
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
+msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
+msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
-#, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr ""
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
-msgstr ""
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
-msgstr ""
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "%s: udelod: %s\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr ""
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr ""
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr ""
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr ""
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1636
 #, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr ""
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
+
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1491
+#: g10/import.c:1804
 #, fuzzy, c-format
-msgid "key %08lX: direct key signature added\n"
+msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr ""
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 #, 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:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:380
+#: g10/keyedit.c:519
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgid "User ID \"%s\" is expired."
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:545
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:593
 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:422
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:657
 #, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:660
 #, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:463
+#: g10/keyedit.c:665
+#, fuzzy
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+
+#: g10/keyedit.c:687
 #, c-format
-msgid "Nothing to sign with key %08lX\n"
+msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 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:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr ""
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:835
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "n�gle"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "sign�r n�glen"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign�r"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "opret en separat signatur"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign�r"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 #, fuzzy
 msgid "nrsign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "tilf�j-bid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "slet bruger id"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "sletn�gle"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "addrevoker"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "udl�b"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 #, fuzzy
 msgid "showpref"
 msgstr "vispr�f"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 #, fuzzy
 msgid "setpref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 #, fuzzy
 msgid "set preference list"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 #, fuzzy
 msgid "updpref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 #, fuzzy
 msgid "updated preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "generel fejl"
+
+#: g10/keyedit.c:1175
+msgid "set preferred keyserver URL"
+msgstr ""
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revuid"
+msgstr "sletbid"
+
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revoke a user ID"
+msgstr "tilf�j bruger-id"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "sl�fra"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "sl�til"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr ""
+
+#: g10/keyedit.c:1515
+#, fuzzy
+msgid "Really revoke this user ID? "
+msgstr "Vil du virkelig oprette?"
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "vis pr�ferencer"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr ""
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr ""
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr ""
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, c-format
-msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "kan ikke oprette %s: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "tilf�j n�gle"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr "N�gle udl�ber d. %s\n"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr "N�gle udl�ber d. %s\n"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr "betro"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:2107
 #, c-format
-msgid " trust: %c/%c"
+msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! undern�gle er blevet annulleret! %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "tilf�j n�gle"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "udl�b"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+#, fuzzy
+msgid "[revoked] "
+msgstr "tilf�j n�gle"
+
+#: g10/keyedit.c:2274
+#, fuzzy
+msgid "[expired] "
+msgstr "udl�b"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2399
 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:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 #, 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:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2703
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+
+#: g10/keyedit.c:2788
+#, fuzzy
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, 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:2750
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:2915
+#: g10/keyedit.c:3496
 #, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2918
+#: g10/keyedit.c:3499
 #, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 #, 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:2931
+#: g10/keyedit.c:3512
 #, 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:2975
+#: g10/keyedit.c:3558
 #, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+msgid "   signed by %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
-msgstr ""
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3013
+#: g10/keyedit.c:3597
 #, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %s on %s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, fuzzy, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+
+#: g10/keyedit.c:3892
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keylist.c:91
+#: g10/keylist.c:179
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/keylist.c:127
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr ""
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr "N�gle udl�ber d. %s\n"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keylist.c:1001
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "tilf�j n�gle"
+
+#: g10/keylist.c:1357
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1003
+#: g10/keylist.c:1359
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1010
+#: g10/keylist.c:1366
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1012
+#: g10/keylist.c:1368
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
+#: g10/keylist.c:1372 g10/keylist.c:1376
 #, fuzzy
-msgid "     Key fingerprint ="
+msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
 #: g10/mainproc.c:248
@@ -3273,239 +3607,332 @@ msgstr "             Fingeraftryk:"
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:258
+#: g10/mainproc.c:262
 #, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "ugyldig hash-algoritme `%s'\n"
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "ukendt cifferalgoritme "
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s/%s krypteret for: %s\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
-msgstr ""
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "ukendt cifferalgoritme "
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr ""
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
-msgstr ""
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "Gentag kodes�tning: "
+
+#: g10/mainproc.c:502
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "Gentag kodes�tning: "
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+#, fuzzy
+msgid "WARNING: message was not integrity protected\n"
+msgstr "ADVARSEL: intet blev eksporteret\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr ""
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Politik: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Denne n�gle er ikke beskyttet.\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "              alias \""
+
+#: g10/mainproc.c:1350
 #, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+#, fuzzy
+msgid "Key available at: "
+msgstr "Ingen hj�lp tilg�ngelig"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, fuzzy, c-format
+msgid "Signature expired %s\n"
+msgstr "Denne n�gle er ikke beskyttet.\n"
+
+#: g10/mainproc.c:1643
+#, fuzzy, c-format
+msgid "Signature expires %s\n"
+msgstr "Denne n�gle er ikke beskyttet.\n"
+
+#: g10/mainproc.c:1646
+#, fuzzy, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s signatur fra: %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr ""
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr ""
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+#, fuzzy
+msgid "unknown"
+msgstr "ukendt version"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/misc.c:509
+#: g10/misc.c:491
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:513
+#: g10/misc.c:495
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
+#: g10/misc.c:508
+#, fuzzy
+msgid "Uncompressed"
+msgstr "ikke bearbejdet"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "ikke bearbejdet"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr ""
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "l�ser indstillinger fra `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "ukendt standard modtager '%s'\n"
+
 #: g10/parse-packet.c:120
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3513,281 +3940,291 @@ msgid ""
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:662
-#, fuzzy
-msgid "Enter passphrase\n"
-msgstr "Indtast kodes�tning: "
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Indtast kodes�tning: "
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr ""
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Indtast kodes�tning: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:1012
+#: g10/passphrase.c:1140
 #, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Indtast kodes�tning: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:101
+#: g10/pubkey-enc.c:103
 #, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/pubkey-enc.c:221
+#: g10/pubkey-enc.c:266
 #, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr ""
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/pubkey-enc.c:249
+#: g10/pubkey-enc.c:292
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "import�r n�gler fra en n�gleserver: %s\n"
-
-#: g10/hkp.c:96
-#, fuzzy, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "import�r n�gler fra en n�gleserver: %s\n"
-
-#: g10/hkp.c:175
-#, fuzzy, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "fejl ved l�sning af '%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr ""
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr ""
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
-
-#: g10/hkp.c:565
-#, fuzzy, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "import�r n�gler fra en n�gleserver: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "valgte cifferalgoritme %d er ugyldig\n"
+
+#: g10/seckey-cert.c:250
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "ugyldig kodes�tning"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:99
 #, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:102
+#, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr ""
+
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
+msgid "public key %s is %lu second newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/sig-check.c:249
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "Denne n�gle er ikke beskyttet.\n"
+
+#: g10/sig-check.c:275
 #, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:348
-#, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:103
+#: g10/sign.c:112
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:151
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:159
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:187
 #, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
+msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/sign.c:644
+#: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/sign.c:690
+#: g10/sign.c:794
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -3802,12 +4239,12 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3816,202 +4253,271 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr ""
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, fuzzy, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: kan ikke �bne: %s\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/trustdb.c:235
+#: g10/trustdb.c:257
 #, fuzzy, c-format
-msgid "key %08lX: accepted as trusted key\n"
+msgid "key %s: accepted as trusted key\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:274
+#: g10/trustdb.c:295
 #, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:290
+#: g10/trustdb.c:310
 #, fuzzy, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+msgid "never"
+msgstr ""
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:574
+#, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "offentlig n�gle ikke fundet"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:991
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:933
-#, fuzzy, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "offentlig n�gle ikke fundet"
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr ""
 
-#: g10/trustdb.c:1515
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr ""
+
+#: g10/trustdb.c:1925
 #, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr ""
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -4038,11 +4544,10 @@ msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 #: g10/skclist.c:179
 #, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4061,26 +4566,31 @@ msgstr "%s: ukendt suffiks\n"
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:326
+#: g10/openfile.c:349
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr ""
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: mappe oprettet\n"
@@ -4103,52 +4613,52 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr ""
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4156,64 +4666,50 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Indtast n�glens st�rrelse"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svar \"ja\" eller \"nej\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4221,19 +4717,19 @@ msgid ""
 "the given value as an interval."
 msgstr ""
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr ""
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr ""
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr ""
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4242,11 +4738,11 @@ msgid ""
 "Q  to to quit the key generation."
 msgstr ""
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 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"
@@ -4287,28 +4783,28 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr ""
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr ""
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4316,13 +4812,13 @@ msgid ""
 "a trust connection through another already certified key."
 msgstr ""
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4331,30 +4827,30 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr ""
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4362,7 +4858,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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4378,75 +4874,491 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 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:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1346
+#: g10/keyring.c:1360
 #, fuzzy, c-format
-msgid "checking keyring `%s'\n"
+msgid "caching keyring `%s'\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyring.c:1377
+#: g10/keyring.c:1406
 #, fuzzy, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu n�gler behandlet indtil nu\n"
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1388
+#: g10/keyring.c:1418
 #, fuzzy, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr ""
+
+#: g10/photoid.c:87
+#, fuzzy, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: g10/photoid.c:97
+#, fuzzy
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr ""
+
+# virker j automatisk istedetfor y?
+#: g10/photoid.c:129
+#, fuzzy
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Er dette korrekt (j/n)? "
+
+#: g10/photoid.c:331
+#, fuzzy
+msgid "unable to display photo ID!\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr ""
+
+#: g10/exec.c:184
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: kan ikke oprette mappe: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr ""
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr ""
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr ""
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr ""
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr ""
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr ""
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr ""
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, fuzzy, c-format
+msgid "build_packet failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "n�gle %08lX: ingen bruger-id\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr ""
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr ""
+
+#: g10/revoke.c:279 g10/revoke.c:476
+#, fuzzy
+msgid "Create a revocation certificate for this key? "
+msgstr "Gener�r en annull�rbar certifikat"
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr ""
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, fuzzy, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "signering fejlede: %s\n"
+
+#: g10/revoke.c:369
+#, fuzzy
+msgid "Revocation certificate created.\n"
+msgstr "n�gle %08lX: offentlig n�gle importeret\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr ""
+
+#: g10/revoke.c:429
+#, fuzzy, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "%s: bruger ikke fundet: %s\n"
+
+#: g10/revoke.c:458
+#, fuzzy, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "skriver offentligt certifikat til '%s'\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr ""
+
+#: g10/revoke.c:492
+#, fuzzy
+msgid "unknown protection algorithm\n"
+msgstr "ukendt kompressionsalgoritme"
+
+#: g10/revoke.c:496
+#, fuzzy
+msgid "NOTE: This key is not protected!\n"
+msgstr "Denne n�gle er ikke beskyttet.\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+
+#: g10/revoke.c:588
+#, fuzzy
+msgid "Please select the reason for the revocation:\n"
+msgstr "rev- forkert n�gletilbagekald\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr ""
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr ""
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+
+#: g10/revoke.c:669
+#, fuzzy, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "rev- forkert n�gletilbagekald\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr ""
+
+#: g10/revoke.c:676
+#, fuzzy
+msgid "Is this okay? "
+msgstr "Brug denne n�gle alligevel? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+
+#: g10/tdbdump.c:140
+#, fuzzy, c-format
+msgid "can't open file: %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr ""
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr ""
+
+#: g10/tdbdump.c:164
+#, fuzzy
+msgid "error: invalid fingerprint\n"
+msgstr "fejl i trailerlinie\n"
+
+#: g10/tdbdump.c:168
+#, fuzzy
+msgid "error: no ownertrust value\n"
+msgstr "eksport�r ejertillidsv�rdierne"
+
+#: g10/tdbdump.c:204
+#, fuzzy, c-format
+msgid "error finding trust record: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: g10/tdbdump.c:208
+#, fuzzy, c-format
+msgid "read error: %s\n"
+msgstr "panser: %s\n"
+
+#~ msgid "store only"
+#~ msgstr "gem kun"
+
+#, fuzzy
+#~ msgid "sign a key non-revocably"
+#~ msgstr "sign�r en n�gle lokalt"
+
+#, fuzzy
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "sign�r en n�gle lokalt"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "vis kun pakkesekvensen"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "eksport�r ejertillidsv�rdierne"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "import�r ejertillidsv�rdierne"
+
+#, fuzzy
+#~ msgid "unattended trust database update"
+#~ msgstr "opdat�r tillidsdatabasen"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "repar�r en �delagt tillidsdatabase"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "De-beskydt en fil el. stdin"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Beskydt en fil el. stdin"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAME|brug NAME som standard modtager"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "brug standard n�glen som standard modtager"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "brug overhovedet ikke terminalen"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "tving v3 signaturer"
+
+#, fuzzy
+#~ msgid "do not force v3 signatures"
+#~ msgstr "tving v3 signaturer"
+
+#, fuzzy
+#~ msgid "force v4 key signatures"
+#~ msgstr "tving v3 signaturer"
+
+#, fuzzy
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "tving v3 signaturer"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "brug altid en MDC for kryptering"
+
+#, fuzzy
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "brug altid en MDC for kryptering"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "k�rselsmodus: sp�rg aldrig"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "forvent ja til de fleste spr�gsm�l"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "forvent nej til de fleste spr�gsm�l"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "tilf�j denne n�glering til n�gleringslisten"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "tilf�j denne hemmeligen�glering til listen"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NAME|brug NAME som standard hemmelign�gle"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAME|s�t terminal karakters�t til NAME"
+
+#~ msgid "read options from file"
+#~ msgstr "l�s indstillinger fra fil"
+
+#, fuzzy
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|FD|skriv statusinfo til denne FD"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FILE|indl�s udvidelsesmodul FILE"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emul�r modusen beskrevet i RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
+
+#, 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|brug pasfrasemodus N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NAME|brug cifferalgoritme NAME"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|brug kompresalgoritme N"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
+
+#, fuzzy
+#~ msgid " (default)"
+#~ msgstr "(standard er 1)"
+
+#~ msgid "Policy: "
+#~ msgstr "Politik: "
+
+#, fuzzy
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "import�r n�gler fra en n�gleserver: %s\n"
+
+#, fuzzy
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "import�r n�gler fra en n�gleserver: %s\n"
+
+#, fuzzy
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "fejl ved l�sning af '%s': %s\n"
+
+#, fuzzy
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu n�gler behandlet indtil nu\n"
+
+#, fuzzy
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "n�gle %08lX: ingen bruger-id\n"
+
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "afslut"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
+
+#, fuzzy
+#~ msgid "Create anyway? "
+#~ msgstr "Brug denne n�gle alligevel? "
+
+#, fuzzy
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "ugyldig hash-algoritme `%s'\n"
+
 #~ msgid "Fingerprint:"
 #~ msgstr "Fingeraftryk:"
 
@@ -4555,9 +5467,6 @@ msgstr ""
 #~ msgid "do not write comment packets"
 #~ msgstr "skriv ikke kommentarpakker"
 
-#~ msgid "(default is 1)"
-#~ msgstr "(standard er 1)"
-
 #~ msgid "(default is 3)"
 #~ msgstr "(standard er 3)"
 
diff --git a/po/de.po b/po/de.po
index 15c958a41..0831d6b55 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,13 @@
 # GnuPG german translation
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-# Walter Koch <[email protected]>, 1998, 1999, 2000, 2001
-#
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Walter Koch <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.0.7\n"
+"Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-05-22 13:30+0200\n"
-"PO-Revision-Date: 2003-11-27 17:50+0100\n"
-"Last-Translator: Walter Koch <[email protected]>\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-07-20 16:01+0200\n"
+"Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -20,7 +19,7 @@ msgstr "WARNUNG: Sensible Daten k�nnten auf Platte ausgelagert werden.\n"
 
 #: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "siehe http://www.gnupg.org/de/faq.html f�r weitere Informationen\n"
+msgstr "siehe http://www.gnupg.org/faq.html f�r weitere Informationen\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
@@ -34,7 +33,6 @@ msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
 #: util/miscutil.c:307 util/miscutil.c:344
-#, fuzzy
 msgid "yes"
 msgstr "ja"
 
@@ -50,7 +48,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:348 g10/keyedit.c:1122
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "quit"
 
@@ -71,8 +69,9 @@ msgid "oO"
 msgstr ""
 
 #: util/miscutil.c:388
+#, fuzzy
 msgid "cC"
-msgstr "cC"
+msgstr "c"
 
 #: util/errors.c:54
 msgid "general error"
@@ -112,7 +111,7 @@ msgstr "Pr�fsummen-Fehler"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "Falsches Mantra"
+msgstr "Falsche Passphrase"
 
 #: util/errors.c:64
 msgid "public key not found"
@@ -176,7 +175,7 @@ msgstr "Fehler beim Erzeugen der Datei"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "Ung�ltiges Mantra"
+msgstr "Ung�ltige Passphrase"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
@@ -284,11 +283,11 @@ msgstr "Schl�sselserverfehler"
 
 #: util/logger.c:183
 msgid "ERROR: "
-msgstr ""
+msgstr "FEHLER: "
 
 #: util/logger.c:186
 msgid "WARNING: "
-msgstr ""
+msgstr "WARNUNG: "
 
 #: util/logger.c:279
 #, c-format
@@ -304,7 +303,7 @@ msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:387 g10/keygen.c:2028 g10/import.c:169
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -385,24 +384,27 @@ msgstr ""
 #: cipher/md.c:137
 #, c-format
 msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
+msgstr "Hashmethode `%s' ist in diesem Release read-only\n"
 
+# translated by wk
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
+"Zufalls wird gesammelt.  Bitte arebiten Sie an etwas anderem, da\n"
+"so die Qualit�t der Zufallszahlen erh�ht werden kann.\n"
 
 #: cipher/primegen.c:120
-#, c-format
+#, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr ""
+msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
 
 #: cipher/primegen.c:311
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
-msgstr ""
+msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
 
 #: g10/g10.c:354
 msgid ""
@@ -449,6 +451,7 @@ msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
 #: g10/g10.c:370
+#, fuzzy
 msgid "list and check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
@@ -578,19 +581,19 @@ msgstr "Keine wirklichen �nderungen durchf�hren"
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/g10.c:506
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:507
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:529
+#: g10/g10.c:530
 msgid "allow the use of admin card commands"
 msgstr ""
 
-#: g10/g10.c:534
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -599,7 +602,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:537
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -619,17 +622,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:712 g10/gpgv.c:91
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:732
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -637,9 +640,9 @@ msgid ""
 msgstr ""
 "Aufruf: gpg [Optionen] [Dateien]\n"
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
-"Die voreingestellte Operation ist abh�ngig von den Eingabedaten.\n"
+"Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -647,494 +650,487 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:746
+#: g10/g10.c:747
 msgid "Pubkey: "
-msgstr ""
+msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:752 g10/keyedit.c:1721
+#: g10/g10.c:753 g10/keyedit.c:1737
 msgid "Cipher: "
-msgstr ""
+msgstr "Verschl�.: "
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Hash: "
-msgstr ""
+msgstr "Hash: "
 
-#: g10/g10.c:764 g10/keyedit.c:1767
+#: g10/g10.c:765 g10/keyedit.c:1783
 msgid "Compression: "
-msgstr "Kompression: "
+msgstr "Komprimierung: "
 
-#: g10/g10.c:847
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:950
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:968
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
 
-#: g10/g10.c:1165
+#: g10/g10.c:1166
 #, c-format
 msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
-msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home Verzeichnisses \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1169
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
-msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfiguartionsdatei \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1171
-#, c-format
+#: g10/g10.c:1172
+#, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension \"%s\"\n"
-msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Erweiterung \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverh�ltnis (%s) \"%s\"\n"
 
-#: g10/g10.c:1177
+#: g10/g10.c:1178
 #, c-format
 msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
-msgstr "WARNUNG: Unsichere Zugriffsrechte der Home Verzeichnisses \"%s\"\n"
+msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis \"%s\"\n"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1181
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1183
-#, c-format
+#: g10/g10.c:1184
+#, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension \"%s\"\n"
-msgstr "WARNUNG: Unsichere Zugriffsrechte der Erweiterung \"%s\"\n"
+msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1190
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr ""
-"WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses des "
-"Home Verzeichniss \"%s\"\n"
+"WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses f�r Home-Verzeichnis "
+"\"%s\"\n"
 
-#: g10/g10.c:1192
+#: g10/g10.c:1193
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
 msgstr ""
-"WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses der "
+"WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses der "
 "Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1195
-#, c-format
+#: g10/g10.c:1196
+#, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
-msgstr ""
-"WARNUNG: Unsicheres Besitzverh�ltnis des �bergeordneten Verzeichnisses der "
-"Erweiterung \"%s\"\n"
+msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses (%s) \"%s\"\n"
 
-#: g10/g10.c:1201
+#: g10/g10.c:1202
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr ""
-"WARNUNG: Unsichere Zugriffsrechte der �bergeordneten Verzeichnisses des Home "
-"Verzeichniss \"%s\"\n"
+"WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses des Home-"
+"Verzeichnisses  \"%s\"\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1205
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file \"%s"
 "\"\n"
 msgstr ""
-"WARNUNG: Unsichere Zugriffsrechte des �bergeordneten Verzeichnisses der "
-"Konfigurationsdatei \"%s\"\n"
+"WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses der Konfigurationsdatei "
+"\"%s\"\n"
 
-#: g10/g10.c:1207
-#, c-format
+#: g10/g10.c:1208
+#, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
-msgstr ""
-"WARNUNG: Unsichere Zugriffsrechte des �bergeordneten Verzeichnisses der "
-"Erweiterung \"%s\"\n"
+msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n"
 
-#: g10/g10.c:1333
-#, fuzzy, c-format
+#: g10/g10.c:1334
+#, c-format
 msgid "unknown configuration item \"%s\"\n"
-msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
+msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/g10.c:1600
+#: g10/g10.c:1601
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1647
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1873 g10/g10.c:2408 g10/g10.c:2419
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
 #, 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:1886
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
 "geladen\n"
 
-#: g10/g10.c:2098
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:2117 g10/keyedit.c:3212
+#: g10/g10.c:2118 g10/keyedit.c:3228
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:2123
+#: g10/g10.c:2124
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: ung�ltige Verify Option.\n"
+msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2127
 #, fuzzy
 msgid "invalid keyserver options\n"
-msgstr "Ung�ltige Verify Option\n"
+msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2133
+#: g10/g10.c:2134
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:2136
+#: g10/g10.c:2137
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:2143
+#: g10/g10.c:2144
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2146
+#: g10/g10.c:2147
 msgid "invalid export options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2171
-#, c-format
+#: g10/g10.c:2172
+#, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: ung�ltige List Option.\n"
+msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:2174
+#: g10/g10.c:2175
+#, fuzzy
 msgid "invalid list options\n"
-msgstr "Ung�ltige List Option\n"
+msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:2197
-#, c-format
+#: g10/g10.c:2198
+#, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: ung�ltige Verify Option.\n"
+msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2200
+#: g10/g10.c:2201
+#, fuzzy
 msgid "invalid verify options\n"
-msgstr "Ung�ltige Verify Option\n"
+msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2207
+#: g10/g10.c:2208
 #, 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:2397
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:2413
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:2434
+#: g10/g10.c:2435
 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:2440
+#: g10/g10.c:2441
 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:2446
+#: g10/g10.c:2447
 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:2459
+#: g10/g10.c:2460
 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/g10.c:2527 g10/g10.c:2551
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2533 g10/g10.c:2557
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2540
 msgid "selected compression algorithm is invalid\n"
-msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
+msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2545
+#: g10/g10.c:2546
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2560
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:2562
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:2564
+#: g10/g10.c:2565
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:2566
-#, fuzzy
+#: g10/g10.c:2567
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
+msgstr "ung�ltiger \"default-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:2568
-#, fuzzy
+#: g10/g10.c:2569
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
+msgstr "ung�ltiger \"min-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2575
+#: g10/g10.c:2576
 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:2582
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2591
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:2595
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2599
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2632
+#: g10/g10.c:2633
 #, c-format
 msgid "%s does not yet work with %s\n"
-msgstr "%s arbeiter noch nicht zusammen mit %s\n"
+msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2680
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2685
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2689
+#: g10/g10.c:2690
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr ""
-"Die Benutzung des Komprimierungsverfahren %s ist im %s-Modus nicht erlaubt.\n"
+"Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2788
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/g10.c:2799
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2806
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:2831
+#: g10/g10.c:2832
+#, fuzzy
 msgid "--symmetric --encrypt [filename]"
-msgstr "--symmetric --encrypt [Dateiname]"
+msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2833
+#: g10/g10.c:2834
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2836
-#, c-format
+#: g10/g10.c:2837
+#, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr ""
-"Die Benutzung von --symmetric --encrypt ist im %s-Modus nicht erlaubt.\n"
+msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2854
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2882
+#: g10/g10.c:2883
+#, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--symmetric --sign --encrypt [Dateiname]"
+msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2884
+#: g10/g10.c:2885
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
-"Die Benutzung von --symmetric --sign-encrypt kann nicht zusammen mit --s2k-"
-"mode 0 geschehen.\n"
 
-#: g10/g10.c:2887
-#, c-format
+#: g10/g10.c:2888
+#, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr ""
-"Die Benutzung von --symmetric --sign --encrypt ist im %s-Modus nicht "
-"erlaubt.\n"
+msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2907
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:2916
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:2949
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:2957
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:3041 g10/encode.c:474 g10/sign.c:891
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:3056
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3094
 #, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "Senden an den Schl�sselserver fehlgeschlagen: %s\n"
+msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3095
+#: g10/g10.c:3096
 #, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "Empfangen vom Schl�sselserverfehler fehlgeschlagen: %s\n"
+msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3097
+#: g10/g10.c:3098
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 #, c-format
 msgid "keyserver search failed: %s\n"
-msgstr "Schl�sselserversuche fehlgeschlagen: %s\n"
+msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3118
+#: g10/g10.c:3119
 #, c-format
 msgid "keyserver refresh failed: %s\n"
-msgstr "Schl�sselserver-Refresh fehlgeschlagen: %s\n"
+msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3159
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3254
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:3377
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:3381
+#: g10/g10.c:3382
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:3384 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:3658
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1142,26 +1138,26 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:3667
+#: g10/g10.c:3668
 msgid "a user notation name must contain the '@' character\n"
-msgstr "Ein \"user-notation\"-Name mu� ein '@' Zeichen verwenden\n"
+msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3677
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3711
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3713
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3746
+#: g10/g10.c:3747
+#, fuzzy
 msgid "the given signature preferred keyserver URL is invalid\n"
-msgstr ""
-"Die angegebene Unterschriften-Bevorzugter-Schl�sselserver-URL ist ung�ltig\n"
+msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
 #: g10/gpgv.c:67
 msgid "be somewhat more quiet"
@@ -1169,11 +1165,11 @@ msgstr "Etwas weniger Infos"
 
 #: g10/gpgv.c:68
 msgid "take the keys from this keyring"
-msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? "
+msgstr "Schl�ssel aus diesem Schl�sselbund nehmen"
 
 #: g10/gpgv.c:70
 msgid "make timestamp conflicts only a warning"
-msgstr "\"Zeitangaben differieren\" soll lediglich eine Warnung sein"
+msgstr "differierende Zeitangaben sind kein Fehler"
 
 #: g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
@@ -1181,13 +1177,13 @@ msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
 #: g10/gpgv.c:95
 msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h f�r Hilfe)"
+msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
 #: g10/gpgv.c:98
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
-msgstr ""
+msgstr "Aufruf: gpgv [Optionen] [Dateien] (-h Hilfe)\n"
 
 #: g10/armor.c:317
 #, c-format
@@ -1218,7 +1214,7 @@ msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 msgid "unexpected armor:"
 msgstr "Unerwartete ASCII-H�lle:"
 
-#: g10/armor.c:695 g10/armor.c:1277
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
@@ -1235,7 +1231,7 @@ msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:780 g10/armor.c:1314
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
@@ -1248,68 +1244,72 @@ msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1092
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1097
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
 
-#: g10/armor.c:1101
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-H�lle gefunden - m�glicherweise\n"
 " war ein fehlerhafter E-Mail-Transporter(\"MTA\") die Ursache\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:576
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "Schl�ssel ist �berholt"
 
-#: g10/pkclist.c:67 g10/revoke.c:577
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schl�ssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:69 g10/revoke.c:579
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "Schl�ssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:71 g10/revoke.c:580
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr g�ltig"
 
-#: g10/pkclist.c:75
+#: g10/pkclist.c:73
 msgid "reason for revocation: "
 msgstr "Grund f�r Widerruf: "
 
-#: g10/pkclist.c:92
+#: g10/pkclist.c:90
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#: g10/pkclist.c:197
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:205
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Es ist kein \"trust value\" zugewiesen f�r:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:234 g10/mainproc.c:1536
-msgid "                aka \""
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                    alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
 msgstr "                    alias \""
 
-#: g10/pkclist.c:245 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1322,116 +1322,116 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/pkclist.c:249
-#, c-format
+#: g10/pkclist.c:250
+#, fuzzy, c-format
 msgid " %d = I don't know or won't say\n"
-msgstr " %d = Wei� nicht so recht oder kann es nicht sagen\n"
+msgstr " %d = Wei� nicht so recht\n"
 
-#: g10/pkclist.c:251
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = Nein, ihm traue ich NICHT\n"
 
-#: g10/pkclist.c:253
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr " %d = Ich vertraue ihm einigerma�en\n"
+msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Ich vertraue ihm absolut\n"
 
-#: g10/pkclist.c:260
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = Bitte weitere Information anzeigen\n"
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = Zur�ck zum Men�\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = diesen Schl�ssel �berSpringen\n"
 
-#: g10/pkclist.c:267
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = verlassen\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
-msgstr ""
+msgstr "Die minimale Trust-Ebene f�r diesen Schl�ssel betr�gt: %s\n"
 
-#: g10/pkclist.c:277 g10/revoke.c:605
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:298
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "M�chten Sie diesem Schl�ssel wirklich uneingeschr�nkt vertrauen? "
 
-#: g10/pkclist.c:312
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate f�hren zu einem letztlich vertrauensw�rdigen Schl�ssel:\n"
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:393 g10/pkclist.c:405 g10/pkclist.c:504
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Diesen Schl�ssel trotzdem benutzen? "
 
-#: g10/pkclist.c:398
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, c-format
 msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Es gibt keinen Hinweis, da� dieser Schl�ssel wirklich dem "
-"vorgeblichen Besitzer geh�rt.\n"
+"%08lX: Es gibt keine Garantie, da� dieser Schl�ssel wirklich dem angegebenen "
+"Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:440
+#: g10/pkclist.c:441
 #, c-format
 msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Es gibt begrenzte Hinweisw, da� dieser Schl�ssel wirklich dem "
-"vorgeblichen Besitzer geh�rt.\n"
+"%08lX: Es gibt nur eine beschr�nkte Garantie, da� dieser Schl�ssel wirklich "
+"dem angegebenen Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:446
+#: g10/pkclist.c:447
+#, fuzzy
 msgid "This key probably belongs to the named user\n"
-msgstr ""
-"Dieser Schl�ssel geh�rt h�chstwahrscheinlich dem angegebenen Besitzer\n"
+msgstr "Dieser Schl�ssel geh�rt wahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:451
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser Schl�ssel geh�rt uns (da wir n�mlich den geheimen Schl�ssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -1442,99 +1442,99 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:513 g10/pkclist.c:543
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:550
-#, fuzzy
+#: g10/pkclist.c:551
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr ""
-"WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
-"nicht vorhanden\n"
+"WARNUNG: Dieser schl�ssel ist u.U. widerrufen: Widerrufschl�ssel ist nicht "
+"vorhanden\n"
 
-#: g10/pkclist.c:559
-#, fuzzy
+#: g10/pkclist.c:560
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
+msgstr ""
+"WARNUNG: Dieser Schl�ssel wurde vom vorgesehen Widerrufer widerrufen!\n"
 
-#: g10/pkclist.c:562
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:563
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:574
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schl�ssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:579
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:590
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:601
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:611
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:763 g10/pkclist.c:799 g10/encode.c:791
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/pkclist.c:776 g10/pkclist.c:809 g10/pkclist.c:978 g10/pkclist.c:1038
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:786 g10/pkclist.c:1010
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 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:844
+#: g10/pkclist.c:845
+#, fuzzy
 msgid "Current recipients:\n"
-msgstr "Liste der aktuellen Empf�nger:\n"
+msgstr "Derzeitige Voreinstellungenliste:\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1542,124 +1542,125 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:891 g10/pkclist.c:953
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:916
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
 
-#: g10/pkclist.c:945
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1045
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
 #: g10/keygen.c:207
-#, c-format
+#, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "Voreinstellung %s ist doppelt\n"
+msgstr "Voreinstellung %c%lu ist doppelt\n"
 
 #: g10/keygen.c:214
+#, fuzzy
 msgid "too many cipher preferences\n"
-msgstr "zu viele Verscl�sselungsverfahren Voreinstellungen\n"
+msgstr "zu viele Hashvoreinstellungen\n"
 
 #: g10/keygen.c:216
 msgid "too many digest preferences\n"
-msgstr "zu viele Hashmethoden Voreinstellungen\n"
+msgstr "zu viele Hashvoreinstellungen\n"
 
 #: g10/keygen.c:218
 msgid "too many compression preferences\n"
-msgstr "zu viele Kompressionsverhfahren Voreinstellungen\n"
+msgstr "zu viele Komprimierungsvoreinstellungen\n"
 
 #: g10/keygen.c:315
-#, c-format
+#, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "Ung�ltiger Begriff `%s' in den Voreinstellungen\n"
+msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:773
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:819
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:881 g10/keygen.c:965 g10/keygen.c:1056
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:886 g10/keygen.c:970 g10/keygen.c:1061
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1161
+#: g10/keygen.c:1165
 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:1163
+#: g10/keygen.c:1167
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:1164
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1166
+#: g10/keygen.c:1170
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1167
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1169
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keygen.c:1174 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:1208 g10/keyedit.c:800 g10/revoke.c:638
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1672,28 +1673,28 @@ msgstr ""
 "              standard Schl�ssell�nge ist 1024 Bit\n"
 "      gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
 
-#: g10/keygen.c:1230
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1239
 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:1237
+#: g10/keygen.c:1241
 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:1240
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
-#: g10/keygen.c:1251
+#: g10/keygen.c:1255
 #, 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:1256
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1701,11 +1702,11 @@ msgstr ""
 "Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:1259
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
 
-#: g10/keygen.c:1260
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1713,17 +1714,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:1269
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:1272 g10/keygen.c:1276
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1739,7 +1740,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:1336
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1755,29 +1756,29 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:1365
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:1370
+#: g10/keygen.c:1374
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s verf�llt nie.\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s verf�llt am %s\n"
 
-#: g10/keygen.c:1383
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1785,11 +1786,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1388
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1805,44 +1806,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1463
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1482
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1488
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1511
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1517
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1853,57 +1854,57 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1526
 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:1527
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1541
 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:1538
+#: g10/keygen.c:1542
 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:1557
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
+"Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1605 g10/keyedit.c:1005
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
-msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen"
+msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keygen.c:1606
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1616
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"Sie m�chten kein Mantra - Dies ist *nicht* zu empfehlen!\n"
-"Es ist trotzdem m�glich.  Sie k�nnen Ihr Mantra jederzeit\n"
+"Sie m�chten keine Passphrase - Dies ist *nicht* zu empfehlen!\n"
+"Es ist trotzdem m�glich.  Sie k�nnen Ihre Passphrase jederzeit\n"
 "�ndern, indem sie dieses Programm mit dem Befehl \"--edit-key\"\n"
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1638
 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"
@@ -1914,58 +1915,58 @@ 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:2202 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
 msgid "sorry, can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/keygen.c:2263
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2447 g10/keygen.c:2572
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2449 g10/keygen.c:2575
-#, c-format
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "schreiben des geheimen Schl�ssel-Stubs nach '%s'\n"
+msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2452 g10/keygen.c:2578
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2561
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2585
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2592
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2615
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2626
+#: g10/keygen.c:2630
 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"
@@ -1974,12 +1975,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:2638 g10/keygen.c:2751
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:2687 g10/sign.c:290
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1987,7 +1988,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2689 g10/sign.c:292
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1995,11 +1996,11 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2698
+#: g10/keygen.c:2702
 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:2726
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
@@ -2016,7 +2017,7 @@ msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 #: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "Fehler beim Erzeugen des Mantras: %s\n"
+msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
 #: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
@@ -2025,9 +2026,9 @@ msgstr ""
 "werden\n"
 
 #: g10/encode.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "using cipher %s\n"
-msgstr "Beglaubigung fehlgeschlagen: %s\n"
+msgstr "benutze Cipher %s\n"
 
 #: g10/encode.c:231 g10/encode.c:544
 #, c-format
@@ -2076,7 +2077,7 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/export.c:162 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
@@ -2096,10 +2097,11 @@ msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schl�ssel %08lX: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
+# translated by wk
 #: g10/export.c:353
-#, c-format
+#, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr ""
+msgstr "WARNUNG: Der geheime Schl�ssel %08lX hat keine einfache SK Pr�fsumme\n"
 
 #: g10/export.c:385
 msgid "WARNING: nothing exported\n"
@@ -2123,8 +2125,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
-"Es gibt keinen privaten Unterschl�ssel zu dem �ffentlichen Unterschl�ssel %-"
-"8lX - ubergangen!\n"
+"Kein privater Schl�ssel zum �ffentlichen Schl�ssel %08lX - �bergangen\n"
 
 #: g10/getkey.c:2400
 #, fuzzy, c-format
@@ -2145,7 +2146,7 @@ msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
 #: g10/import.c:250
-#, c-format
+#, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
@@ -2242,7 +2243,7 @@ msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 #: g10/import.c:600
 #, fuzzy, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
+msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
 #: g10/import.c:613
 msgid "it is strongly suggested that you update your preferences and\n"
@@ -2265,7 +2266,7 @@ msgstr "Schl�ssel %08lX: Keine User-ID\n"
 #: g10/import.c:707
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "Schl�ssel %08lX: PKS Unterschl�sseldefekt repariert\n"
+msgstr "Schl�ssel %08lX: HKP Unterschl�sseldefekt repariert\n"
 
 #: g10/import.c:722
 #, fuzzy, c-format
@@ -2368,8 +2369,8 @@ msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
-"Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltigem Verschl�sselungsverfahren "
-"%d - �bersprungen\n"
+"Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltiger Verschl�sselung %d - "
+"�bersprungen\n"
 
 #: g10/import.c:1064
 #, c-format
@@ -2428,7 +2429,9 @@ msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
 #: g10/import.c:1319
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
+msgstr ""
+"Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
+"Beglaubigung\n"
 
 #: g10/import.c:1330 g10/import.c:1380
 #, fuzzy, c-format
@@ -2448,7 +2451,9 @@ msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
 #: g10/import.c:1369
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r den Schl�sselwiderruf\n"
+msgstr ""
+"Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
+"Beglaubigung\n"
 
 #: g10/import.c:1382
 #, fuzzy, c-format
@@ -2458,7 +2463,8 @@ msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 #: g10/import.c:1397
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf entfernt\n"
+msgstr ""
+"Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf-Beglaubigung entfernt\n"
 
 #: g10/import.c:1439
 #, fuzzy, c-format
@@ -2495,7 +2501,7 @@ msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
-"Schl�ssel %08lX: Nicht erwartete Unterschrift (Klasse %02x) - �bergangen\n"
+"Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
 
 #: g10/import.c:1636
 #, fuzzy, c-format
@@ -2572,12 +2578,13 @@ msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 #: g10/keyedit.c:314
 #, c-format
 msgid "   (%d) I trust marginally\n"
-msgstr "  (%d) Ich vertraue ihm einigerma�en\n"
+msgstr "   (%d) Ich vertraue ihm marginal\n"
 
+# c-format
 #: g10/keyedit.c:315
 #, c-format
 msgid "   (%d) I trust fully\n"
-msgstr "  (%d) Ich vertraue ihm vollst�ndig\n"
+msgstr "   (%d) Ich vertraue ihm vollst�ndig\n"
 
 #: g10/keyedit.c:334
 msgid ""
@@ -2585,37 +2592,42 @@ msgid ""
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"Geben Sie bitte die Tiefe dieser \"Trust\"-Unterschrift ein.\n"
+"Eine Tiefe gr��er 1 erlaubt dem zu unterschreibenden Schl�ssel\n"
+"Trust-Signatures f�r Sie zu machen.\n"
 
 #: g10/keyedit.c:350
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
+"Geben Sie bitte eine Domain ein, um die Unterschrift einzuschr�nken,\n"
+"oder nur die Eingabetaste f�r keine Domain\n"
 
 #: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:500 g10/keyedit.c:520 g10/keyedit.c:541 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1354
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:508 g10/keyedit.c:528 g10/keyedit.c:549 g10/keyedit.c:698
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:519
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
-msgstr "WARNUNG: User-ID \"%s\" ist nicht eigenbeglaubigt."
+msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2624,26 +2636,26 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:607
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
-"Ihre derzeitige Beglaubigung f�r \"%s\"\n"
+"Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:611
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
-"M�chten Sie eine neue Beglaubigung erzeugen, die die abgelaufene ersetzt? (j/"
-"N) "
+"Soll eine neue Beglaubigung als Ersatz f�r die abgelaufene erstellt werden? "
+"(J/n) "
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2652,44 +2664,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:636
 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:641
+#: g10/keyedit.c:657
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:660
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:649
+#: g10/keyedit.c:665
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "Wollen Sie es immmer noch beglaubigen? (j/N) "
+msgstr "Wollen Sie ihn immmer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:671
+#: g10/keyedit.c:687
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:710
+#: g10/keyedit.c:726
 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:743
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2697,11 +2709,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:745
+#: g10/keyedit.c:761
 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:770
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2711,31 +2723,32 @@ msgstr ""
 "wollen, wirklich der o.g. Person geh�rt?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:793
 #, 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:779
+#: g10/keyedit.c:795
 #, 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:781
+#: g10/keyedit.c:797
 #, 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:787
+# translated by wk
+#: g10/keyedit.c:803
 msgid "Your selection? (enter '?' for more information): "
-msgstr ""
+msgstr "Ihre Auswahl? ('?' f�r weitere Informationen): "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2743,7 +2756,7 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2751,7 +2764,7 @@ msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2760,7 +2773,7 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2768,7 +2781,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2776,7 +2789,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2784,7 +2797,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2792,7 +2805,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2800,7 +2813,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2808,582 +2821,586 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:861
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:906 g10/keyedit.c:3632 g10/keyedit.c:3723 g10/keyedit.c:3796
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:990
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
+"Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
+"Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:1079
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:1136
+#: g10/keyedit.c:1152
 msgid "tsign"
 msgstr "tsign"
 
-#: g10/keyedit.c:1136
+#: g10/keyedit.c:1152
 msgid "make a trust signature"
-msgstr "Eine \"Trust\"-Unterschrift erzeugen"
+msgstr "Eine Trust-Unterschrift erzeugen"
 
-#: g10/keyedit.c:1137
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:1137
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "Den Schl�ssel nicht-widerrufbar beglaubigen"
 
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "Den Schl�ssel nicht-widerrufbar und nur f�r diesen Rechner signieren"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1164
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
 msgstr "Einen Widerrufschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "ge�nderte Voreinstellungen"
 
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1175
+#, fuzzy
 msgid "keyserver"
-msgstr "Schl�sselserver"
+msgstr "Schl�sselserverfehler"
 
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1175
+#, fuzzy
 msgid "set preferred keyserver URL"
-msgstr "Bevorzugte-Schl�sselserver-URI setzen"
+msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
-msgstr "Das Mantra �ndern"
+msgstr "Die Passphrase �ndern"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1179
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1179
 msgid "revoke a user ID"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1186 g10/delkey.c:120
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/keyedit.c:1217
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1234
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:1300
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1384
 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:1393
+#: g10/keyedit.c:1409
 #, 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:1415 g10/keyedit.c:1436 g10/keyedit.c:1495
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1459 g10/keyedit.c:1514
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1462
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1514
 msgid "Really revoke all selected user IDs? "
-msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich widerrufen? "
+msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1499
+#: g10/keyedit.c:1515
 msgid "Really revoke this user ID? "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:1518
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1519
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1558
+#: g10/keyedit.c:1574
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1590
+#: g10/keyedit.c:1606
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 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:1598
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1659
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1666
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1673
+#: g10/keyedit.c:1689
 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:1685
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1760
 msgid "Digest: "
-msgstr ""
+msgstr "Digest: "
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1812
 msgid "Features: "
-msgstr ""
+msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1823
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2047
+#: g10/keyedit.c:2063
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2065 g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
 #, fuzzy, c-format
 msgid "created: %s"
-msgstr "erstellt: %s verf�llt: %s"
+msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2084
 #, fuzzy, c-format
 msgid "revoked: %s"
-msgstr "widerrufen"
+msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2070
+#: g10/keyedit.c:2086
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2072 g10/keyedit.c:2121 g10/keyedit.c:2224 g10/keyedit.c:2239
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2103
 #, fuzzy, c-format
 msgid "trust: %s"
-msgstr " Vertrauen: %-13s"
+msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2091
+#: g10/keyedit.c:2107
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "G�ltigkeit: %s"
 
-#: g10/keyedit.c:2098
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2130
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#: g10/keyedit.c:2160 g10/keylist.c:696 g10/mainproc.c:1544 g10/trustdb.c:1124
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
 msgid "revoked"
-msgstr "widerrufen"
+msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2162 g10/keylist.c:698 g10/mainproc.c:1546 g10/trustdb.c:499
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
 msgid "expired"
-msgstr "abgelaufen"
+msgstr "expire"
 
-#: g10/keyedit.c:2183
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schl�ssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2191
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3391,23 +3408,24 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2256 g10/mainproc.c:923
-#, fuzzy
+#: g10/keyedit.c:2272 g10/mainproc.c:930
 msgid "[revoked] "
-msgstr "revkey"
+msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2258
-#, fuzzy
+#: g10/keyedit.c:2274
 msgid "[expired] "
-msgstr "expire"
+msgstr "[verfallen]"
 
-#: g10/keyedit.c:2323
+# translated by wk
+#: g10/keyedit.c:2339
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
+"WARNUNG: Keine User-ID ist als prim�r markiert.  Dieses Kommando kann\n"
+"dazu f�hren, da� eine andere User-ID as prim�r angesehen wird.\n"
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3417,144 +3435,143 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2388 g10/keyedit.c:2661
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 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:2394
+#: g10/keyedit.c:2410
 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:2529
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2543
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2549
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2563
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2564
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2567
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2656
+#: g10/keyedit.c:2672
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 "WARNUNG: Dies ist ein PGP2-artiger Schl�ssel. Hinzuf�gen eines vorgesehenen\n"
-"         Widerrufers kann bei einigen PGP-Versionen zur Zur�ckweisung des\n"
-"         Schl�ssels f�hren.\n"
+"         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
+"         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2683
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
-"Sie k�nnen einem PGP2-artigen Schl��sel keinen vorgesehenen Widerrufer "
+"Sie k�nnen einem PGP2-artigen Schl��sel keine vorgesehenen Widerrufer "
 "hinzuf�gen.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
-"Ein PGP 2.x-artiger Schl�ssel kann nicht als designierter Widerrufer "
+"Ein PGP 2.x-artiger Schl�ssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
-"Ein Schl�ssel kann nicht als sein eigener designierter Widerrufer agieren\n"
+msgstr "Ein Schl�ssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2763
 msgid "this key has already been designated as a revoker\n"
-msgstr "Ein Schl�ssel ist bereits als Widerrufer vorgesehen\n"
+msgstr "Dieser Schl�ssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2782
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
-"Einen Schl�ssel mit einem designierter Widerrufer zu versehen, kann nicht "
-"r�ckg�ngig gemacht werden!\n"
+"WARNUNG: Einen Schl�ssel als vorgesehenen Widerrufer zu deklarieren, kann "
+"nicht r�ckgangig gemacht werden!\n"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2788
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
-"M�chten diesen Schl�ssel wirklich als designiertern Widerrufer einstellen? "
-"(j/N): "
+"M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
+"deklarieren? (j/N): "
 
-#: g10/keyedit.c:2833
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:2843
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:2892
+#: g10/keyedit.c:2908
 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:2908
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:2988
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3137 g10/keyedit.c:3251
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "�berspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3215
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3315
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3496
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3563,7 +3580,7 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:3483
+#: g10/keyedit.c:3499
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3572,65 +3589,66 @@ msgstr ""
 "\"\n"
 "lokal unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:3488
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3492
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:3521
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3558
 #, fuzzy, c-format
 msgid "   signed by %s on %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:3551
+#: g10/keyedit.c:3567
 #, fuzzy, c-format
 msgid "   revoked by %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:3571
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3597
 #, fuzzy, c-format
 msgid "   signed by %s on %s%s\n"
 msgstr "   beglaubigt durch %08lX am %s%s\n"
 
-#: g10/keyedit.c:3583
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3590
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:3620
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3706
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "User-ID \"%s\" ist bereits widerrufen.\n"
+msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:3707
+#: g10/keyedit.c:3723
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "WARNUNG: Eine User-ID Unterschrift liegt %d Sekunden in der Zukunft.\n"
+msgstr ""
+"WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:3876
+#: g10/keyedit.c:3892
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3672,46 +3690,47 @@ msgstr "nicht als Klartext darstellbar"
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
-#: g10/keylist.c:629 g10/keylist.c:658 g10/keylist.c:756 g10/keylist.c:781
-#: g10/mainproc.c:925
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [verf�llt: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
 
-#: g10/keylist.c:654 g10/keylist.c:752
+#: g10/keylist.c:646 g10/keylist.c:743
 #, fuzzy, c-format
 msgid " [revoked: %s]"
-msgstr "revkey"
-
-#: g10/keylist.c:656 g10/keylist.c:754
-#, fuzzy, c-format
-msgid " [expired: %s]"
-msgstr " [verf�llt: %s]"
+msgstr "[widerrufen]"
 
-#: g10/keylist.c:1366
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1368
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1375
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1377
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1381 g10/keylist.c:1385
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
 msgid "      Key fingerprint ="
-msgstr " Schl.-Fingerabdruck ="
+msgstr "  Schl.-Fingerabdruck ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr "Seltsame L�nge des verschl�sselten Session-Keys (%d)\n"
+msgstr "Seltsame L�nge f�r einen verschl�sselten Sitzungsschl�ssel (%d)\n"
 
 #: g10/mainproc.c:262
 #, c-format
@@ -3733,178 +3752,189 @@ msgstr "%s verschl�sselte Daten\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:309
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
+
+#: g10/mainproc.c:373
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:421
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:455
+#: g10/mainproc.c:462
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, 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:465
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
-msgstr "Verschl�sselt mit %lu Passphrasen\n"
+msgstr "Verschl�sselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
-msgstr "Verschl�sselt mit 1 Passphrase\n"
+msgstr "Verschl�sselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:523 g10/mainproc.c:545
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschl�sselte Daten\n"
 
-#: g10/mainproc.c:531
+#: g10/mainproc.c:538
 #, 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:563
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "Entschl�sselung erfolgreich\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
-msgstr "WARNUNG: Die Nachricht war nicht gegen Ver�nderungen gesch�tzt\n"
+msgstr ""
+"WARNUNG: Botschaft wurde nicht integrit�tsgesch�tzt (integrity protected)\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:780
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1276
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
-#: g10/mainproc.c:1318 g10/mainproc.c:1328
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
-#: g10/mainproc.c:1338
+#: g10/mainproc.c:1345
 #, fuzzy, c-format
 msgid "Signature made %s\n"
-msgstr "Unterschrift erstellt durch %.*s\n"
+msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1339
+#: g10/mainproc.c:1346
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
-msgstr "                      mittels %s Schl�ssel %08lX%08lX\n"
+msgstr "                    alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1343
+#: g10/mainproc.c:1350
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
-#: g10/mainproc.c:1363
+#: g10/mainproc.c:1370
 msgid "Key available at: "
-msgstr "Schl�ssel verf�gbar bei: "
+msgstr "Schl�ssel erh�ltlich bei: "
 
-#: g10/mainproc.c:1463 g10/mainproc.c:1499
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1464 g10/mainproc.c:1500
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1465 g10/mainproc.c:1501
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1631
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                    alias \""
+
+#: g10/mainproc.c:1638
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1636
+#: g10/mainproc.c:1643
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verf�llt am %s.\n"
 
-#: g10/mainproc.c:1639
+#: g10/mainproc.c:1646
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1640
+#: g10/mainproc.c:1647
 msgid "binary"
-msgstr "bin�r"
+msgstr "Bin�re"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1648
 msgid "textmode"
-msgstr ""
+msgstr "Textmodus"
 
-#: g10/mainproc.c:1641 g10/trustdb.c:498
+#: g10/mainproc.c:1648 g10/trustdb.c:498
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1661
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1729 g10/mainproc.c:1745 g10/mainproc.c:1831
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1772
+#: g10/mainproc.c:1779
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
+"WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste gepr�ft.\n"
 
-#: g10/mainproc.c:1780
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1837
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1847
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -3947,11 +3977,12 @@ msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
 #: g10/misc.c:508
 msgid "Uncompressed"
-msgstr "unkomprimiert"
+msgstr "nicht komprimiert"
 
 #: g10/misc.c:533
+#, fuzzy
 msgid "uncompressed|none"
-msgstr "uncompressed|none|nicht"
+msgstr "nicht komprimiert"
 
 #: g10/misc.c:643
 #, c-format
@@ -3959,14 +3990,14 @@ msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
 
 #: g10/misc.c:777
-#, c-format
+#, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "Mehrdeutige Optionen `%s'\n"
+msgstr "Optionen werden aus '%s' gelesen\n"
 
 #: g10/misc.c:802
-#, c-format
+#, fuzzy, c-format
 msgid "unknown option `%s'\n"
-msgstr "Unbekannte Option '%s'\n"
+msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
 #: g10/parse-packet.c:120
 #, c-format
@@ -3976,6 +4007,8 @@ msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 #: g10/parse-packet.c:703
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
+"WARNUNG: M�glicherweise unsicherer symmetrisch verschl�sselter "
+"Sitzungsschl�ssel\n"
 
 #: g10/parse-packet.c:1128
 #, c-format
@@ -4033,21 +4066,21 @@ msgid ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
-"Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
+"Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \"\"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %08lX, erzeugt %s%s\n"
 
 #: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
-msgstr "Geben Sie das Mantra nochmal ein\n"
+msgstr "Geben Sie die Passphrase nochmal ein\n"
 
 #: g10/passphrase.c:715
 msgid "Enter passphrase\n"
-msgstr "Geben Sie das Mantra ein\n"
+msgstr "Geben Sie die Passphrase ein\n"
 
 #: g10/passphrase.c:753
 msgid "passphrase too long\n"
-msgstr "Mantra ist zu lang\n"
+msgstr "Passphrase ist zu lang\n"
 
 #: g10/passphrase.c:766
 msgid "invalid response from agent\n"
@@ -4062,70 +4095,70 @@ msgstr "Abbruch durch Benutzer\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:1044 g10/passphrase.c:1189
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
 msgid "can't query password in batchmode\n"
-msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
+msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1193
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
 msgid "Enter passphrase: "
-msgstr "Geben Sie das Mantra ein: "
+msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:1119
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 "\n"
-"Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
+"Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:1128
+#: g10/passphrase.c:1140
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1149
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1153
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:1197
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
-msgstr "Geben Sie das Mantra nochmal ein: "
+msgstr "Geben Sie die Passphrase nochmal ein: "
 
-#: g10/plaintext.c:72
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
 
-#: g10/plaintext.c:114 g10/plaintext.c:132
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: g10/plaintext.c:420
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:424
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:487
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
@@ -4171,22 +4204,27 @@ msgstr "Teile des geheimen Schl�ssels sind nicht vorhanden\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "Schutzverfahren %d%s wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:71
+#, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "Hashschutzverfahren %d wird nicht unterst�tzt\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
-msgstr "Ung�ltiges Mantra; versuchen Sie es bitte noch einmal"
+msgstr "Ung�ltige Passphrase; versuchen Sie es bitte noch einmal"
 
-#: g10/seckey-cert.c:245
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:305
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
-"         bitte Mantra nochmals wechseln.\n"
+"         bitte Passphrase nochmals wechseln.\n"
 
-#: g10/seckey-cert.c:343
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "Die mi�billigte 16-bit Pr�fsumme wird zum Schutz des geheimen Schl�ssels "
@@ -4197,16 +4235,15 @@ msgid "WARNING: signature digest conflict in message\n"
 msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
 
 #: g10/sig-check.c:99
-#, c-format
+#, fuzzy, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr ""
+msgstr "WARNUNG: Signaturunterschl�ssel %08lX hat keine R�cksignatur\n"
 
 #: g10/sig-check.c:102
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"Einen Schl�ssel mit einem designierter Widerrufer zu versehen, kann nicht "
-"r�ckg�ngig gemacht werden!\n"
+"WARNUNG: Signaturunterschl�ssel %08lX hat eine ung�ltige R�cksignatur\n"
 
 #: g10/sig-check.c:168
 #, fuzzy, c-format
@@ -4252,25 +4289,27 @@ msgstr ""
 #: g10/sig-check.c:532
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r den Schl�sselwiderruf\n"
+msgstr ""
+"Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
+"Beglaubigung\n"
 
 #: g10/sig-check.c:558
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
+msgstr ""
+"Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
+"Beglaubigung\n"
 
 #: g10/sign.c:85
-#, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
-"Ein PGP 2.x-artiger Schl�ssel kann nicht als designierter Widerrufer "
-"eingetragen werden\n"
+"Notationen k�nnen in einen v3 (PGP 2.x-artigen) Schl�ssel nicht eingetragen "
+"werden\n"
 
 #: g10/sign.c:93
-#, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
-"Ein PGP 2.x-artiger Schl�ssel kann nicht als designierter Widerrufer "
+"Notationen k�nnen in eine v3 (PGP 2.x-artige) Schl�sselunterschrift nicht "
 "eingetragen werden\n"
 
 #: g10/sign.c:112
@@ -4281,15 +4320,17 @@ msgstr ""
 "\"unerweiterte\".\n"
 
 #: g10/sign.c:138
-#, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
-"Ein PGP 2.x-artiger Schl�ssel kann nicht als designierter Widerrufer "
+"Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schl�ssel nicht "
 "eingetragen werden\n"
 
+# translated by wk
 #: g10/sign.c:146
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
+"Eine Policy URL kann in einem v3 Schl�ssel(PGP 2.x artig) nicht gespeichert "
+"werden\n"
 
 #: g10/sign.c:159
 #, fuzzy, c-format
@@ -4540,7 +4581,7 @@ msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 #: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "trust record %lu, type %d: write failed: %s\n"
+msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
 
 #: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
@@ -4559,24 +4600,24 @@ msgstr ""
 
 #: g10/trustdb.c:500
 msgid "undefined"
-msgstr ""
+msgstr "unbestimmt"
 
 #: g10/trustdb.c:501
+#, fuzzy
 msgid "never"
-msgstr ""
+msgstr "niemals   "
 
 #: g10/trustdb.c:502
 msgid "marginal"
-msgstr ""
+msgstr "marginal"
 
 #: g10/trustdb.c:503
 msgid "full"
-msgstr ""
+msgstr "vollst�ndig"
 
 #: g10/trustdb.c:504
-#, fuzzy
 msgid "ultimate"
-msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
+msgstr "uneingeschr�nkt"
 
 #: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
@@ -4588,14 +4629,15 @@ msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
 
 #: g10/trustdb.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "no need for a trustdb check with \"%s\" trust model\n"
-msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
+msgstr ""
+"\"Trust-DB\"-�berpr�fung ist beim \"%s\"-Vertrauensmodell nicht n�tig\n"
 
 #: g10/trustdb.c:574
-#, fuzzy, c-format
+#, c-format
 msgid "no need for a trustdb update with \"%s\" trust model\n"
-msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
+msgstr "\"Trust-DB\"-�nderung ist beim \"%s\"-Vertrauensmodell nicht n�tig\n"
 
 #: g10/trustdb.c:792 g10/trustdb.c:1222
 #, fuzzy, c-format
@@ -4604,22 +4646,21 @@ msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
 #: g10/trustdb.c:987
 msgid "please do a --check-trustdb\n"
-msgstr ""
+msgstr "Bitte ein --check-trustdb durchf�hren\n"
 
 #: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
+# translated by wk
 #: g10/trustdb.c:1847
-#, fuzzy, c-format
+#, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr "%lu Schl�ssel bislang bearbeitet\n"
+msgstr "%d Schl�ssel verarbeitet (%d Validity Z�hler gel�scht)\n"
 
 #: g10/trustdb.c:1911
-#, fuzzy
 msgid "no ultimately trusted keys found\n"
-msgstr ""
-"�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
+msgstr "kein uneingeschr�nkt vertrauensw�rdiger Schl�ssel %08lX gefunden\n"
 
 #: g10/trustdb.c:1925
 #, fuzzy, c-format
@@ -4630,7 +4671,7 @@ msgstr ""
 #: g10/trustdb.c:1948
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
-msgstr ""
+msgstr "%d marignal-needed, %d complete-needed, %s Trust-Modell\n"
 
 #: g10/trustdb.c:2034
 #, c-format
@@ -4639,9 +4680,11 @@ msgid ""
 msgstr ""
 
 #: g10/trustdb.c:2109
-#, fuzzy, c-format
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "trust record %lu, type %d: write failed: %s\n"
+msgstr ""
+"\"Trust-DB\"-Versions-Satz kann nicht ge�ndert werden: Schreiben "
+"fehlgeschlagen: %s\n"
 
 #: g10/verify.c:110
 msgid ""
@@ -4723,6 +4766,7 @@ msgstr "Neue Konfigurationsdatei `%s' erstellt\n"
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
+"WARNUNG: Optionen in `%s' sind w�hrend dieses Laufes noch nicht wirksam\n"
 
 #: g10/openfile.c:380
 #, c-format
@@ -5070,14 +5114,14 @@ msgstr ""
 
 #: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz \n"
+msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
 
 #: g10/helptext.c:239
 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"
+"Um sicher zu gehen, da� Sie sich bei der Eingabe der Passphrase nicht\n"
 "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
-"�bereinstimmen, wird das Mantra akzeptiert."
+"�bereinstimmen, wird die Passphrase akzeptiert."
 
 #: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
@@ -5185,7 +5229,7 @@ msgstr "Pr�fen des Schl�sselbundes `%s'\n"
 #: g10/keyring.c:1406
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
+msgstr "%lu Schl�ssel bislang gepr�ft (%lu Beglaubigungen)\n"
 
 #: g10/keyring.c:1418
 #, fuzzy, c-format
@@ -5197,6 +5241,7 @@ msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
+# translated by wk
 #: g10/photoid.c:65
 #, c-format
 msgid ""
@@ -5206,97 +5251,104 @@ msgid ""
 "very large picture, your key will become very large as well!\n"
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
+"\n"
+"W�hlen Sie ein Bild f�r Ihre Photo ID aus. Das Bild mu� eine JPEG Datei\n"
+"sein.  Bitte beachten Sie, da� das Bild in Ihrem �ffentlichen\n"
+"Schl�ssel gespeichert wird.  Wenn Sie ein sehr gro�es Bild benutzen,\n"
+"wir Ihr Schl�ssel leider auch sehr gro� werden.  Ein Bild der Gr��e\n"
+"240x288 Pixel ist eine gute Wahl.\n"
 
 #: g10/photoid.c:79
 msgid "Enter JPEG filename for photo ID: "
-msgstr ""
+msgstr "Dateiname mit JPEG f�r die Photo ID eingeben: "
 
 #: g10/photoid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open photo \"%s\": %s\n"
-msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+msgstr "Das Bild \"%s\" konnte nicht ge�ffnet werden: %s\n"
 
 #: g10/photoid.c:97
-#, fuzzy
 msgid "Are you sure you want to use it (y/N)? "
-msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
+msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
 #: g10/photoid.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" is not a JPEG file\n"
-msgstr "%s: keine trustdb Datei\n"
+msgstr "`%s' ist keine JPEG Datei\n"
 
 #: g10/photoid.c:129
-#, fuzzy
 msgid "Is this photo correct (y/N/q)? "
-msgstr "Ist dies richtig? (j/n) "
+msgstr "Ist dieses Bild richtig? (j/N) "
 
 #: g10/photoid.c:331
-#, fuzzy
 msgid "unable to display photo ID!\n"
-msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+msgstr "Die Photo ID kann nicht angezeigt werden!\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
-msgstr ""
+msgstr "Ausf�hren von externen Programmen wird nicht unterst�tzt\n"
 
 #: g10/exec.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "can't create directory `%s': %s\n"
-msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
+msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
 #: g10/exec.c:325
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
+"Ausf�hren von externen Programmen ist ausgeschaltet, da die Dateirechte "
+"nicht sicher sind\n"
 
 #: g10/exec.c:355
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
+"Diese Plattform ben�tigt tempor�re Dateien zur Ausf�hrung von externen\n"
+"Programmen\n"
 
 #: g10/exec.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute %s \"%s\": %s\n"
-msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+msgstr "Ausf�hren von %s \"%s\" nicht m�glich: %s\n"
 
 #: g10/exec.c:513
-#, fuzzy, c-format
+#, c-format
 msgid "system error while calling external program: %s\n"
-msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
+msgstr "Fehler beim Aufruf eines externen Programms: %s\n"
 
 #: g10/exec.c:524 g10/exec.c:583
 msgid "unnatural exit of external program\n"
-msgstr ""
+msgstr "ungew�hnliches Ende eines externen Programms\n"
 
 #: g10/exec.c:539
-#, fuzzy
 msgid "unable to execute external program\n"
-msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+msgstr "Externes Programm konnte nicht aufgerufen werden\n"
 
 #: g10/exec.c:548
-#, fuzzy, c-format
+#, c-format
 msgid "unable to read external program response: %s\n"
-msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
+msgstr "Die Ausgabe des externen Programms konnte nicht gelesen werden: %s\n"
 
 #: g10/exec.c:594 g10/exec.c:601
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr ""
+"WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
 #: g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
-msgstr ""
+msgstr "WARNUNG: Tempor�res Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
 #: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
 msgid "never     "
-msgstr ""
+msgstr "niemals   "
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
 #: g10/revoke.c:187 g10/revoke.c:541
-#, fuzzy, c-format
+#, c-format
 msgid "build_packet failed: %s\n"
-msgstr "�nderung fehlgeschlagen: %s\n"
+msgstr "\"build_packet\" fehlgeschlagen: %s\n"
 
 #: g10/revoke.c:146
 #, fuzzy, c-format
@@ -5305,60 +5357,57 @@ msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
 #: g10/revoke.c:271
 msgid "To be revoked by:\n"
-msgstr ""
+msgstr "Schl�ssel soll widerrufen werden von:\n"
 
 #: g10/revoke.c:275
 msgid "(This is a sensitive revocation key)\n"
-msgstr ""
+msgstr "(Dies ist ein \"sensitiver\" Widerrufsschl�ssel)\n"
 
 #: g10/revoke.c:279 g10/revoke.c:476
-#, fuzzy
 msgid "Create a revocation certificate for this key? "
-msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
+msgstr "Ein Widerrufszertifikat f�r diesen Schl�ssel erzeugen? (j/N) "
 
 #: g10/revoke.c:292 g10/revoke.c:507
 msgid "ASCII armored output forced.\n"
-msgstr ""
+msgstr "Ausgabe mit ASCII H�lle erzwungen\n"
 
 #: g10/revoke.c:306 g10/revoke.c:521
-#, fuzzy, c-format
+#, c-format
 msgid "make_keysig_packet failed: %s\n"
-msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
+msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
 
 #: g10/revoke.c:369
-#, fuzzy
 msgid "Revocation certificate created.\n"
-msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
+msgstr "Widerrufzertifikat erzeugt.\n"
 
 #: g10/revoke.c:375
 #, c-format
 msgid "no revocation keys found for `%s'\n"
-msgstr ""
+msgstr "Widerrufsschl�ssel f�r `%s' nicht gefunden\n"
 
 #: g10/revoke.c:429
-#, fuzzy, c-format
+#, c-format
 msgid "secret key `%s' not found: %s\n"
-msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
+msgstr "Geheimer Schl�ssel `%s' nicht gefunden: %s\n"
 
 #: g10/revoke.c:458
-#, fuzzy, c-format
+#, c-format
 msgid "no corresponding public key: %s\n"
-msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
+msgstr "kein zugeh�riger �ffentlicher Schl�ssel: %s\n"
 
 #: g10/revoke.c:469
 msgid "public key does not match secret key!\n"
-msgstr ""
+msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
 
 #: g10/revoke.c:492
-#, fuzzy
 msgid "unknown protection algorithm\n"
-msgstr "Unbekanntes Komprimierverfahren"
+msgstr "Unbekanntes Schutzverfahren\n"
 
 #: g10/revoke.c:496
-#, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
+# translated by wk
 #: g10/revoke.c:547
 msgid ""
 "Revocation certificate created.\n"
@@ -5369,41 +5418,46 @@ msgid ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 msgstr ""
+"Widerrufszertifikat wurde erzeugt.\n"
+"\n"
+"Bitte speichern Sie es auf einem Medium welches sie wegschliessen\n"
+"k�nnen; falls Mallory (ein Angreifer) Zugang zu diesem Zertifikat\n"
+"erh�lt, kann erIhren Schl�ssel unbrauchbar machen.  Es w�re klug,\n"
+"dieses Widerrufszertifikat auch auszudrucken und sicher aufzubewahren,\n"
+"falls das urspr�ngliche Mediumnicht mehr lesbar ist. Aber Obacht: Das\n"
+"Drucksystem kann unter Umst�nden eine Kopie anderen Nutzern zug�nglich\n"
+"machen.\n"
 
 #: g10/revoke.c:588
-#, fuzzy
 msgid "Please select the reason for the revocation:\n"
-msgstr "Grund f�r Widerruf: "
+msgstr "Grund f�r den Widerruf:\n"
 
 #: g10/revoke.c:598
 msgid "Cancel"
-msgstr ""
+msgstr "Abbruch"
 
 #: g10/revoke.c:600
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr ""
+msgstr "(Wahrscheinlich m�chten Sie hier %d ausw�hlen)\n"
 
 #: g10/revoke.c:641
-#, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
-"\n"
-"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
+"Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
 #: g10/revoke.c:669
-#, fuzzy, c-format
+#, c-format
 msgid "Reason for revocation: %s\n"
-msgstr "Grund f�r Widerruf: "
+msgstr "Grund f�r Widerruf: %s\n"
 
 #: g10/revoke.c:671
 msgid "(No description given)\n"
-msgstr ""
+msgstr "(Keine Beschreibung angegeben)\n"
 
 #: g10/revoke.c:676
-#, fuzzy
 msgid "Is this okay? "
-msgstr "Diesen Schl�ssel trotzdem benutzen? "
+msgstr "Ist das richtig? "
 
 #: g10/tdbdump.c:104
 #, c-format
@@ -5411,153 +5465,46 @@ msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
+"# Liste de zugewiesenden Trustwerte, erzeugt am %s\n"
+"# (\"gpg --import-ownertrust\" um sie zu restaurieren)\n"
 
 #: g10/tdbdump.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "can't open file: %s\n"
-msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
+msgstr "Datei kann nicht ge�ffnet werden: %s\n"
 
 #: g10/tdbdump.c:151
-#, fuzzy
 msgid "line too long\n"
-msgstr "Mantra ist zu lang\n"
+msgstr "Zeile ist zu lang\n"
 
 #: g10/tdbdump.c:159
 msgid "error: missing colon\n"
-msgstr ""
+msgstr "Fehler: Doppelpunkt fehlt\n"
 
 #: g10/tdbdump.c:164
-#, fuzzy
 msgid "error: invalid fingerprint\n"
-msgstr "%s: invalid file version %d\n"
+msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
 #: g10/tdbdump.c:168
-#, fuzzy
 msgid "error: no ownertrust value\n"
-msgstr "Exportieren der \"Owner trust\"-Werte"
+msgstr "Fehler: Kein \"Owner trust\"-Wert\n"
 
 #: g10/tdbdump.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record: %s\n"
-msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
+msgstr "Fehler beim Suchen des \"Trust records\": %s\n"
 
 #: g10/tdbdump.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "read error: %s\n"
-msgstr "ASCII-H�lle: %s\n"
-
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
-
-#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-#~ msgstr "%s%c %4u%c/%08lX  erstellt: %s verf�llt: %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "key %08lX: this is a PGP generated Elgamal key which is NOT secure for "
-#~ "signatures!\n"
-#~ msgstr ""
-#~ "Schl�ssel %08lX: Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r "
-#~ "Signaturen NICHT sicher genug!\n"
+msgstr "Lesefehler: %s\n"
 
+# translated by wk
 #~ msgid ""
-#~ "key %08lX has been created %lu second in future (time warp or clock "
-#~ "problem)\n"
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
-#~ "Der Schl�ssel %08lX wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise "
-#~ "oder Uhren stimmen nicht �berein)\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu seconds in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "Der Schl�ssel %08lX wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise "
-#~ "oder Uhren stimmen nicht �berein)\n"
-
-#, fuzzy
-#~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr ""
-#~ "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
-
-#, fuzzy
-#~ msgid "key %08lX incomplete\n"
-#~ msgstr "Schl�ssel %08lX: Keine User-ID\n"
-
-#~ msgid "quit|quit"
-#~ msgstr "quit"
-
-#~ msgid "Current preference list:\n"
-#~ msgstr "Aktuelle Liste der Voreinstellungen:\n"
-
-#~ msgid ""
-#~ "Select the algorithm to use.\n"
-#~ "\n"
-#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-#~ "for signatures.  This is the suggested algorithm because verification of\n"
-#~ "DSA signatures are much faster than those of ElGamal.\n"
-#~ "\n"
-#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
-#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-#~ "only\n"
-#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
-#~ "selected in a special way to create a safe key for signatures: this "
-#~ "program\n"
-#~ "does this but other OpenPGP implementations are not required to "
-#~ "understand\n"
-#~ "the signature+encryption flavor.\n"
-#~ "\n"
-#~ "The first (primary) key must always be a key which is capable of "
-#~ "signing;\n"
-#~ "this is the reason why the encryption only ElGamal key is not available "
-#~ "in\n"
-#~ "this menu."
-#~ msgstr ""
-#~ "W�hlen Sie die zu verwendende Methode aus.\n"
-#~ "\n"
-#~ "DSA (alias DSS) bedeutet \"digital signature algorithm\" (Digitales\n"
-#~ "  Unterschrift-Verfahren). Es kann nur zum Unterschreiben und "
-#~ "Beglaubigen\n"
-#~ "  benutzt werden. Dies ist das empfohlene Verfahren, da dessen "
-#~ "�berpr�fung\n"
-#~ "  wesentlich schneller abl�uft, als die von \"ElGamal\".\n"
-#~ "\n"
-#~ "ElGamal ist ein Verfahren f�r Unterschrift, Beglaubigung und "
-#~ "Verschl�sselung\n"
-#~ "  OpenPGP unterscheidet zwischen zwei Arten von ElGamal: eines nur zum\n"
-#~ "  Unterschreiben/Beglaubigen und eines zus�tzlich zum Verschl�sseln.\n"
-#~ "  Eigentlich sind diese Arten identisch; allerdings m�ssen einige "
-#~ "Parameter\n"
-#~ "  auf eine besondere Art gew�hlt werden, um einen sicheren Schl�ssel f�r\n"
-#~ "  Unterschriften zu erzeugen. Dieses Programm macht dies zwar so, aber "
-#~ "andere\n"
-#~ "  Programme sind laut der OpenPGP-Spezifikation nicht verpflichtet, die\n"
-#~ "  zweite Art (die mit zus�tzlichem Verschl�sseln) zu verstehen.\n"
-#~ "\n"
-#~ "Der Hauptschl�ssel (\"primary Key\") mu� auf jeden Fall zum "
-#~ "Unterschreiben f�hig\n"
-#~ "sein. Deshalb kann ein nur-Verschl�ssel-ElGamal-Schl�ssel daf�r nicht\n"
-#~ "verwendet werden."
-
-#~ msgid ""
-#~ "Although these keys are defined in RFC2440 they are not suggested\n"
-#~ "because they are not supported by all programs and signatures created\n"
-#~ "with them are quite large and very slow to verify."
-#~ msgstr ""
-#~ "Obwohl diese Schl�ssel in RFC 2440 definiert sind, ist ihre Verwendung "
-#~ "nicht\n"
-#~ "empfohlen. Sie werden n�mlich nicht von allen Programmen unterst�tzt.\n"
-#~ "Au�erdem sind damit ezeugte Unterschriften recht gro� und ihre "
-#~ "�berpr�fung\n"
-#~ "ist langsam."
-
-#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
-
-#~ msgid "Create anyway? "
-#~ msgstr "Trotzdem erzeugen? "
-
-#~ msgid "invalid symkey algorithm detected (%d)\n"
-#~ msgstr "Ung�ltiger Veschl�sselungsalgorithmus entdeckt (%d)\n"
+#~ "WARNUNG: Hashmethode `%s' ist nicht Teil von OpenPGP.  Benutzung auf "
+#~ "eigenes Risiko!\n"
 
 #~ msgid "|[files]|encrypt files"
 #~ msgstr "|[Dateien]|Dateien verschl�sseln"
@@ -5680,13 +5627,13 @@ msgstr "ASCII-H�lle: %s\n"
 #~ "Hashoptionen auf PGP 2.X-Verhalten einstellen"
 
 #~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|Verwenden des Mantra-Modus N"
+#~ msgstr "|N|Verwenden des Passphrasen-Modus N"
 
 #~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
+#~ msgstr "|NAME|Hashverfahren NAME f�r Passphrasen benutzen"
 
 #~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NAME|Verschl.verfahren NAME f�r Mantras benutzen"
+#~ msgstr "|NAME|Verschl.verfahren NAME f�r Passphrasen benutzen"
 
 #~ msgid "|NAME|use cipher algorithm NAME"
 #~ msgstr "|NAME|Verschl.verfahren NAME benutzen"
@@ -5694,8 +5641,7 @@ msgstr "ASCII-H�lle: %s\n"
 #~ msgid "|NAME|use message digest algorithm NAME"
 #~ msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#, fuzzy
-#~ msgid "|NAME|use compression algorithm NAME"
+#~ msgid "|N|use compress algorithm N"
 #~ msgstr "|N|Komprimierverfahren N benutzen"
 
 #~ msgid "throw keyid field of encrypted packets"
@@ -5710,22 +5656,19 @@ msgstr "ASCII-H�lle: %s\n"
 #~ msgid "Set command line to view Photo IDs"
 #~ msgstr "Kommandozeilentext f�r den Foto-Betrachter setzen"
 
-#~ msgid "Notation: "
-#~ msgstr "\"Notation\": "
-
-#~ msgid "Policy: "
-#~ msgstr "Richtlinie: "
-
-#, fuzzy
-#~ msgid "checking at depth %d valid=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-#~ msgstr ""
-#~ "�berpr�fen, Tiefe %d, unterschrieben =%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
-#~ "d\n"
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "Kompressionsverfahren `%s' ist in diesem Release read-only\n"
 
 #~ msgid "compress algorithm must be in range %d..%d\n"
 #~ msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
 
 #~ msgid ""
+#~ "%08lX: There is no indication that this key really belongs to the owner\n"
+#~ msgstr ""
+#~ "%08lX: Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
+#~ "Besitzer geh�rt.\n"
+
+#~ msgid ""
 #~ "%08lX: It is not sure that this key really belongs to the owner\n"
 #~ "but it is accepted anyway\n"
 #~ msgstr ""
@@ -5733,25 +5676,33 @@ msgstr "ASCII-H�lle: %s\n"
 #~ "vorgeblichen\n"
 #~ "Besitzer geh�rt, aber er wird trotzdem akzeptiert\n"
 
-#~ msgid "The use of this algorithm is deprecated - create anyway? "
-#~ msgstr ""
-#~ "Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "Voreinstellung %c%lu ist nicht g�ltig\n"
 
-#, fuzzy
-#~ msgid "do NOT trust"
-#~ msgstr " %d = Nein, ihm traue ich NICHT\n"
+#~ msgid "too many `%c' preferences\n"
+#~ msgstr "zu viele `%c' Voreinstellungen\n"
 
-#, fuzzy
-#~ msgid "full trust"
-#~ msgstr "trust"
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
 
-#~ msgid "preference %c%lu is not valid\n"
-#~ msgstr "Voreinstellung %c%lu ist nicht g�ltig\n"
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "HINWEIS: Elgamal-Hauptschl�ssel gefunden - der Import k�nnte einige Zeit "
+#~ "dauern\n"
 
-#, fuzzy
 #~ msgid " (default)"
 #~ msgstr "Daten entschl�sseln (Voreinstellung)"
 
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  erstellt: %s verf�llt: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "\"Notation\": "
+
+#~ msgid "Policy: "
+#~ msgstr "Richtlinie: "
+
 #~ msgid "requesting key %08lX from %s\n"
 #~ msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
@@ -5767,8 +5718,8 @@ msgstr "ASCII-H�lle: %s\n"
 #~ msgid "failed sending to `%s': status=%u\n"
 #~ msgstr "Senden an `%s' erfolglos (status=%u)\n"
 
-#~ msgid "this keyserver is not fully HKP compatible\n"
-#~ msgstr "Dieser Schl�sselserver ist nicht vollst�ndig HKP kompatibel\n"
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "Dieser Schl�sselserver unterst�tzt --search-keys nicht\n"
 
 #~ msgid "searching for \"%s\" from HKP server %s\n"
 #~ msgstr "suche nach \"%s\" auf HKP-Server %s\n"
@@ -5776,13 +5727,154 @@ msgstr "ASCII-H�lle: %s\n"
 #~ msgid "can't search keyserver: %s\n"
 #~ msgstr "kann Schl�sselserver nicht durchsuchen: %s\n"
 
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "Schl�ssel %08lX: Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r "
+#~ "Signaturen NICHT sicher genug!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "Der Schl�ssel %08lX wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise "
+#~ "oder Uhren stimmen nicht �berein)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "Der Schl�ssel %08lX wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise "
+#~ "oder Uhren stimmen nicht �berein)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr ""
+#~ "Schl�ssel %08lX ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "Signatur von Elgamal Signaturschl�ssel %08lX f�r %08lX ignoriert\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "Signatur von %08lX f�r Elgamal Signaturschl�ssel %08lX ignoriert\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr "�berpr�fen, Tiefe %d, g�ltig=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "W�hlen Sie die zu verwendende Methode aus.\n"
+#~ "\n"
+#~ "DSA (alias DSS) bedeutet \"digital signature algorithm\" (Digitales\n"
+#~ "  Unterschrift-Verfahren). Es kann nur zum Unterschreiben und "
+#~ "Beglaubigen\n"
+#~ "  benutzt werden. Dies ist das empfohlene Verfahren, da dessen "
+#~ "�berpr�fung\n"
+#~ "  wesentlich schneller abl�uft, als die von \"ElGamal\".\n"
+#~ "\n"
+#~ "ElGamal ist ein Verfahren f�r Unterschrift, Beglaubigung und "
+#~ "Verschl�sselung\n"
+#~ "  OpenPGP unterscheidet zwischen zwei Arten von ElGamal: eines nur zum\n"
+#~ "  Unterschreiben/Beglaubigen und eines zus�tzlich zum Verschl�sseln.\n"
+#~ "  Eigentlich sind diese Arten identisch; allerdings m�ssen einige "
+#~ "Parameter\n"
+#~ "  auf eine besondere Art gew�hlt werden, um einen sicheren Schl�ssel f�r\n"
+#~ "  Unterschriften zu erzeugen. Dieses Programm macht dies zwar so, aber "
+#~ "andere\n"
+#~ "  Programme sind laut der OpenPGP-Spezifikation nicht verpflichtet, die\n"
+#~ "  zweite Art (die mit zus�tzlichem Verschl�sseln) zu verstehen.\n"
+#~ "\n"
+#~ "Der Hauptschl�ssel (\"primary Key\") mu� auf jeden Fall zum "
+#~ "Unterschreiben f�hig\n"
+#~ "sein. Deshalb kann ein nur-Verschl�ssel-ElGamal-Schl�ssel daf�r nicht\n"
+#~ "verwendet werden."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Obwohl diese Schl�ssel in RFC 2440 definiert sind, ist ihre Verwendung "
+#~ "nicht\n"
+#~ "empfohlen. Sie werden n�mlich nicht von allen Programmen unterst�tzt.\n"
+#~ "Au�erdem sind damit ezeugte Unterschriften recht gro� und ihre "
+#~ "�berpr�fung\n"
+#~ "ist langsam."
+
 #~ msgid "%lu keys so far checked (%lu signatures)\n"
 #~ msgstr "%lu Schl�ssel bislang gepr�ft (%lu Beglaubigungen)\n"
 
+#~ msgid "key incomplete\n"
+#~ msgstr "Schl�ssel nicht vollst�ndig\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "Schl�ssel %08lX unvollst�ndig\n"
+
+#~ msgid "no|no"
+#~ msgstr "nein"
+
+#~ msgid "quit|quit"
+#~ msgstr "quit"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "Dieses Verfahren wird nur von GnuPG unterst�tzt.  Sie k�nnen diesen "
+#~ "Schl�ssel\n"
+#~ "nicht zur Verst�ndigung mit PGP-Anwendern benutzen.  Ausserdem ist "
+#~ "dieses\n"
+#~ "Verfahren sehr langsam, und es k�nnte nicht so sicher wie die anderen "
+#~ "sein.\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "Trotzdem erstellen? "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "Ung�ltiger Veschl�sselungsalgorithmus entdeckt (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "Dieser Schl�sselserver ist nicht vollst�ndig HKP kompatibel\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr ""
+#~ "Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
+
+#~ msgid "do NOT trust"
+#~ msgstr " %d = Nein, ihm traue ich NICHT\n"
+
+#~ msgid "full trust"
+#~ msgstr "trust"
+
 #~ msgid "no values for group \"%s\"\n"
 #~ msgstr "Keine Werte f�r Gruppe \"%s\"\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "you have to start GnuPG again, so it can read the new configuration file\n"
 #~ msgstr ""
diff --git a/po/el.po b/po/el.po
index 047506317..ad12bc6c5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,54 +5,72 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-09-12 03:24+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
 msgstr "�������������: ����� �� �������� ������!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
-msgstr "���"
+msgstr "���|���"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
-msgstr "���"
+msgstr "���|���"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "�����������"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "������ ������"
@@ -249,7 +267,6 @@ msgstr "�� ���������������"
 msgid "not processed"
 msgstr "�� �������������"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "�� ��������������� ������� ������"
@@ -262,74 +279,82 @@ msgstr "�� ��������������� ������� ������"
 msgid "keyserver error"
 msgstr "������ ���������� ��������"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... ���� ����� bug (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ��� ����� �������� ������ - ���������\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "��������: �� ������ random_seed ����� �����\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "�������������: �� ������ ������� ������� random_seed - ���\n"
 "��������������\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -354,7 +379,32 @@ msgstr ""
 "�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
 "����������� ��������! (����������� %d ����������� bytes)\n"
 
-#: g10/g10.c:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+"� ���������� ��������� `%s' ����� �� ���� ��� ������ ��� �������� ����\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"������ ����������, � �������� ��������������. ����� ��� ���� �������\n"
+"��� �� ��� ���������, ����� ���� �� ��������� ��� �������� ��� ��������.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -362,163 +412,128 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[������]|������������� �������"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "���������� ����"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[������]|���������������� �������"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "�������� ���� �������� ��-�����������"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "�������� ���� �������� ������ ��� ��-�����������"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "���������� ���� ��� ���������� �������"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "������� ��� ����� ������������"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "�������� ��� ����� ������������"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "�������� ��� �������������� ����� ��������� ������������"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "�������� ���� ��������� ����� ��������� ������������"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "��������-��������� ���� ������� � stdin"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "��������-��������� ���� ������� � stdin"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -528,198 +543,55 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|�����|����� ��� �������� �� ��������������� ���������"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "���������"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "����� ������"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "�� ����� ����������"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "������������ ������ v3 ���������"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "��� ������������ ������ v3 ���������"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "������������ ������ v4 ���������"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "��� ������������ ������ v4 ���������"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "����� ������� MDC ��� �������������"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "���� ����� MDC ��� �������������"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "����� ��� gpg-agent"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "��������� batch: �� �� �������� ���������"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "�������� ��� ���� ������������ ���������"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "�������� ��� ���� ������������ ���������"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "�������� ����� ��� �������� ����������� ��� �����"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|�����|����� �������� ��� �������������� ������� ������"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "�������� �������� ��� ������"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|������� ��� ����������� ���������� ��� FD"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[������]|������� ��� ����������� ���������� ��� ������"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|KEYID|������� ����������� �� ���� �� ������"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|������|������� ��� ���������� ��������� ������"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "��������� ��� ���������� ��� ������������ ��� RFC1991"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"����������� ���� ��� �������� ������,���������� ��� �������� �� OPENPGP"
 
-#: g10/g10.c:443
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
-"������� ���� ��� �������� ������,����������,�������� �� PGP 2.x �����������"
-
-#: g10/g10.c:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|����� ��� ���������� ������ ������ N"
 
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
-"|ONOMA|����� ��� ���������� ��������� ��������� ����� ��� ������� �������"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|�����|����� ���������� �������������� �����"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|�����|����� ���������� ��������� ��������� ����� "
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|����� ���������� ��������� N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "�������� ��� ������ keyid ��� ���������������� �������"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "���������� ��� Photo ID"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "�� ���������� ��� Photo ID"
-
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "������� ��� ������� ������� ��� ���������� ��� Photo ID"
-
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -727,7 +599,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -747,15 +619,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -765,7 +637,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -773,421 +645,629 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "�����������:"
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "���������������: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "��������: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/g10.c:983
-#, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:986
-#, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:989
-#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:993
-#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr ""
+"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr ""
+"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "������� ����������� ��������� \"%s\"\n"
+
+#: g10/g10.c:1601
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: �� ������� �������� ��������\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "�� ������� �������� ��������\n"
+
+#: g10/g10.c:2134
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2137
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:1560
+#: g10/g10.c:2144
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:1563
+#: g10/g10.c:2147
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: �� ������� �������� ���������\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "�� ������� �������� ���������\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: �� ������� �������� ��������\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "�� ������� �������� ��������\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
+
+#: g10/g10.c:2546
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/g10.c:1845
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr "� ���������� ��������� ������ �� ����� ������ %d..%d\n"
-
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:1862
-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:1868
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/g10.c:1876
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/g10.c:1880
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:1884
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
+
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [����� �������]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [����� �������]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "�������� ��������� ��� %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver �������� �������: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver ���� �������: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "������� �������� �������: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver ��������� �������: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver �������� �������: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/g10.c:2691
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
-"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� " 
-"���� ��� �� ����� �� ��� '='\n"
+"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
+"��� �� ����� �� ��� '='\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/g10.c:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "����� ������"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "������� ��� �������� ��� ���� �� ����������"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|������� ��� ����������� ���������� ��� FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"�������: gpg [��������] [������]\n"
+"������� ��������� �� �������� �� ������ ������������ �������\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "��������: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "�� ������ ����������� ���������: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "����������� ���������: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "�� ������ ����������� clearsig\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "����������� �� ���������������� ���������\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "�� ����������� ��������:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "������ ����� ������� (������� CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "������ ����� ������� (����� CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "������ CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "������ ����� ������� (��� �railer)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
 "������������� MTA\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "��� ���� ������� �����"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "�� ������ ���� ����������"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "�� ������ ���� �������"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "�� ������ �� ��������������� �����"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "�� User ID ��� ����� ����� ������"
 
@@ -1199,21 +1279,28 @@ msgstr "����� ��� ��������:"
 msgid "revocation comment: "
 msgstr "������ ���������:"
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "��� ������ ���� ������������ ���:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                ������ ��� \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                ������ ��� \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1225,109 +1312,112 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = ��� ����\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d =  ��� ��� �����������\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = ������������ �������\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = ���� ��� ������ �����\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = �����������\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "������� ������ ���� �� ������ �� ������� ��� �������� ������������; "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "������ %08lX: �� ������ ���� ���������!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "����� ���������� ����� ��� ��������; "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "������ %08lX: �� ��������� ���� ���������!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: �� ������ ���� �����\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: ��� �������������� ���� �� ������\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: ��� ����� ������ ��� ���� �� ������ ������ ���� ���������\n"
-"���� �� ���� ���������� ������� �����\n"
+"%08lX: ��� ������� ������� ��� � �������� ���� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "���� �� ������ ������� ������ ���� ���������\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "���� �� ������ ������ �� ����\n"
 
-#: g10/pkclist.c:513
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -1339,76 +1429,96 @@ msgstr ""
 "�� ���������� ���� ������� ������� ����������\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�������������: ����� �������� ����� �����������!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"�������������: ���� �� ������ ������ �� ��������� (������ �� ������ "
+"���������)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr ""
+"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         ���� ������ �� �������� ��� � �������� ����� ������������.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "�������������: ���� �� ��������� ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "��������: ���� �� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "��������: ���� �� ������ ���� �����!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
 "��������!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�������������: ��� �������������� ���� �� ������!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         � �������� ������ ����� ������������.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
 "������� ������������!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ������������: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
 
-#: g10/pkclist.c:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1416,131 +1526,127 @@ msgstr ""
 "\n"
 "�������������� �� user ID. ����� �� ��� ����� ������: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "��� ������� ���� �� user ID.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "�� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "������������: ������� ������ ���� ��� �������\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr "� ���������� %c%lu ��� ����� ������\n"
-
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "� ���������� %c%lu ������������\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "���� ������ `%c' �����������\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "���� ������ `%c' �����������\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "���� ������ `%c' �����������\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
 msgstr "������� ������ ���������\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (�������� ��� �������������)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (�������� ��� �������������)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/keygen.c:966 g10/keygen.c:984
-msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr ""
-"� ����� ����� ��� ���������� �������������� - ������� �� ������������; "
-
-#: g10/keyedit.c:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1553,41 +1659,33 @@ msgstr ""
 "              �������������� ������� �������� ����� 1024 bits\n"
 "    ������� ������������ ������� �������� ����� 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "� DSA ��������� ���� ������� �������� ��� 512 ��� 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "�� ������� �������� ����� ���� �����, 1024 ����� � �������� ���� ��� RSA.\n"
 
-#: g10/keygen.c:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 "�� ������� �������� ����� ���� �����, 768 ����� � �������� ������������ "
 "����.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 "�� ������� �������� ����� ���� ������, %d ����� � ������� ���� ��� "
 "�����������.\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1595,11 +1693,11 @@ msgstr ""
 "������ �������� ���������� ��� 2048 ��� ����������� �����\n"
 "�� ����������� ����� ����������!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "������� ������ ���� �� ������� ��������; "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1607,17 +1705,17 @@ msgstr ""
 "�������, ���� �� ����� ��'��� ��� � ����� ��� �� ������������ �����\n"
 "������ ���� ����� �� ���������!\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1633,7 +1731,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1649,30 +1747,29 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1680,11 +1777,11 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1700,44 +1797,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1748,27 +1845,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
-#: g10/keygen.c:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1542
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1776,16 +1873,16 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1797,7 +1894,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1809,53 +1906,58 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "�������, ��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "������� ��� �������� �������� ��� `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "�������� �������� ��� �������� ������������.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1865,12 +1967,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1878,7 +1980,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1886,550 +1988,618 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "������� �� ������������; "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: �������� ��������� ���: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "����� ��� ���������������: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: �������������: ����� ������\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� ��� `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "�������� ������ ��� ��������������� IDEA ��� ��� �� ������� �� �� "
 "�������������������.\n"
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:558 g10/sign.c:758
+#: g10/encode.c:634 g10/sign.c:863
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:703
-#, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-
-#: g10/encode.c:735
+#: g10/encode.c:818
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "������ %08lX: ��� ����� ��� rfc2440 ������ - ������������\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:296
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/import.c:597
+#: g10/import.c:576
 #, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:612
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s ��������, ���������� ��������� %s\n"
+
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:663
-#, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:740
-#, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:743
-#, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:746
-#, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:749
-#, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:752
-#, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:755
-#, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:774
-#, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:844
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
+
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:969
-#, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
-#, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1088
-#, c-format
-msgid "key %08lX: no subkey for key revocation\n"
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1097
-#, c-format
-msgid "key %08lX: invalid subkey revocation\n"
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
-#, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1232
-#, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1460
-#, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = ��� ������ �����������\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = ��� ����� �����������\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:380
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�� user ID \"%s\" ���� �����."
+
+#: g10/keyedit.c:545
 #, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������.\n"
+msgid "User ID \"%s\" is not self-signed."
+msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2438,13 +2608,25 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"� ������������ �������� ��� ��� \"%s\"\n"
+"���� �����.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
+
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2453,39 +2635,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "������� ������ ����� �� �� ��������������; (y/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2493,11 +2679,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2507,27 +2693,31 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "� ������� ���; (�������������� ? ��� �����������): "
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2535,7 +2725,7 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2543,7 +2733,7 @@ msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2551,7 +2741,7 @@ msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2560,7 +2750,7 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2568,7 +2758,7 @@ msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2577,7 +2767,7 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2585,7 +2775,7 @@ msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2593,7 +2783,7 @@ msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2601,33 +2791,34 @@ msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2635,466 +2826,551 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "������� ������������� �������� N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "���������� ���������"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "�������� ��� ��������"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "���������� ���� �� ������������� ���������"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "�������� ��� �������� ��-�����������"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "�������� ��� �������� ������ ��� ��-�����������"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "�������� ���� user ID"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "������ ��� ����������� �����"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "��������"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "����������� ��������"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "������ ���������� ��������"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "�������� ���� user ID"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "���������� photo ID"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "������> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "������� ������ �� ��������� ���� �� user ID; "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "������� ����������� ��������"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "��������: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "����������: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (���������)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, c-format
-msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX  ����������: %s ����: %s"
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[����������]"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [�����: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [�����: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �� ������ ����������: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- ������� ������������ ��������\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �������� ���� ������ ���������: %s\n"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[����������]"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3102,7 +3378,23 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[����������]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[�������]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
+"              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3111,233 +3403,296 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"�������������: ���� ����� ��� ������ ����� PGP 2.x. � �������� ����\n"
+"               ������������ �������� ������ �� ����� ������� �������� PGP\n"
+"               �� �� ����������.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+"��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr ""
+"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+"�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
+"���������!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
+"N): "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ������� ���������� ������ �� ������ %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "����������� ������ �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#. FIXME: detect duplicates here
-#: g10/keyedit.c:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+"�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:91
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "�������������: �������� �� ������ �������� ���������\n"
 
-#: g10/keylist.c:127
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "����������"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [�����: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [�����: %s]"
 
-#: g10/keylist.c:1001
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[����������]"
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1003
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
-#: g10/keylist.c:1010
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1012
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
 #: g10/mainproc.c:248
@@ -3345,242 +3700,331 @@ msgstr "     ��������� �������� ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:258
+#: g10/mainproc.c:262
 #, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "�� ������� ����������  hash `%s'\n"
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "���� ����� ������ �������� ���������� �������������� (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "��������������� �� ������� ��������� %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "��������������� �� %lu ������� �������\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "��������������� �� 1 ����� ������\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "��������: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "��������: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "�������� %.*s �� ����� ��� ��������%s ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "�������� ����� ���� %s.\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                ������ ��� \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "�������� ����� ���� %s.\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "�������� ����� ���� %s.\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s ��������, ���������� ��������� %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "�������"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "���������-��������"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "�������"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "������������ ���������� ��� ������ �� ����������������!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "� ����� ����� ��� ���������� �������������� ��� ����������. �������������� "
 "��� ��� �����������!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
+#: g10/misc.c:491
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:513
+#: g10/misc.c:495
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "����������"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "����������"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "�������� �������� ��� `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "�������� ��������������� ���������� `%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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "�������� ������� ��� pid ��� ������ ��� �� agent\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "�������� ��������� ��� FD ��� �� ���������� ��� ��� agent\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "�������� �������� ��� FD ��� �� ���������� ��� ��� agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3592,32 +4036,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "�������������� �� ����� ������\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "�������������� �� ����� ������\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "�� ������ �������� ��� ��� agent\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "�������������� �� ����� ������: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3627,263 +4079,273 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "�������������� �� ����� ������: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "�������� ���������� ������ �������� �������� %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "�������, ������� � �������� ����������.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "������ ������������ ��� DEK ��� �������������\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "� ���������� �������������� %d%s ����� �������� � �����������������\n"
 
-#: g10/pubkey-enc.c:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "��������: � ���������� �������������� %d ��� ����� ���� ��������\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/pubkey-enc.c:249
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
-#: g10/hkp.c:71
-#, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "������ �������� %08lX ��� �� %s\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "�������� ����� ��� �������� ��� �� ����������: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "������ ��� �������� ���� �� `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "�������� ��� ��������� ��� `%s' (���������=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "�������� ���� �������� ���� �� `%s': ���������=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "����� � ����������� �������� ��� ����� ������ HKP ��������\n"
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "�������� ���������� ����������: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "��� ������������� � ���������� ���������� %d%s\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "�� ������ ����� ������, ��������� ����"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�������������: ����������� ������� ������ - ������� �� ����� ������\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "���������� ��� �� ������������� 16-bit checksum ��� �� ��������� ���\n"
 "�������� ��������\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "�������������: ��������� ��������� ��������� ��� ������\n"
 
-#: g10/sig-check.c:215
-#, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
-"���� ��, ������������� ��� PGP, ������ ElGamal ��� ����� ������� ��� "
-"���������!\n"
+"�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
+"������������\n"
 
-#: g10/sig-check.c:224
-#, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr ""
+"�������������: �� ��������� ��������� %08lX ���� ����� ���' ������������� "
+"�����������\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:225
-#, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr ""
 "�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:234
-#, c-format
+#: g10/sig-check.c:180
+#, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
-"�� ������ %08lX ������������� %lu ������������ ��� ������ (��������� �\n"
+"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:236
-#, c-format
+#: g10/sig-check.c:182
+#, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
-"�� ������ %08lX ������������� %lu ������������ ��� ������ (��������� �\n"
+"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
 
-#: g10/sig-check.c:348
-#, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� �����������\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"�������� ����������� ��������� �������� �� ��������� v3 (PGP 2.x ����)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+"�������� ����������� ��������� �������� �� ��������� �������� v3 (PGP 2.x "
+"����)\n"
+
+#: g10/sign.c:112
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:151
-#, c-format
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "�������� ����������� URL ��������� �� ��������� v3 (PGP 2.x ����)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"�������� ����������� URL ��������� �� ��������� �������� v3 (PGP 2.x ����)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
+"               ����� �� ������������.\n"
+
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:312
-#, c-format
-msgid "%s signature from: \"%s\"\n"
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/sign.c:644
+#: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/sign.c:690
+#: g10/sign.c:794
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
@@ -3898,12 +4360,12 @@ msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
@@ -3912,197 +4374,267 @@ msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "���� ������ ��������� trustdb\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: �������� ���������: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: � ������� ��� �������!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: �������� ����������� ����������� (lock)\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: �������� ����������� ����������� (lock)\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: �������� �����������: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �������� ����������� ���� �������� �������: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ������������� �� ������ trustdb\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ������������� � trustdb\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
 msgstr "��������: � trustdb ��� ����� ���������\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: �� ������ trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: ������� lseek: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: ������� ������� �� recnum %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �� ������ ������ ������� %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ��� ����� ������ ����� keyID\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "������ %08lX: ������� ��� ������ �� �����������\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�� ������ %08lX ������� ���� ��� ��� ���� ���� trustdb\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
 "���������\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "�������� �������� ��� �������� ������������.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "����     "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "�� ������� ������ %08lX ��� �������: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "�������� ����� ��� --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "�� ������� ������ %08lX ��� �������: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "�� �������� ������� ������������ �������\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
 #, 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"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "������� trust %lu, ����� %d: write �������: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4112,7 +4644,7 @@ msgstr ""
 "�������� ��� ������� ��� �� ������ ��������� (.sig or .asc)\n"
 "������ �� ����� �� ����� ������ ��� ������ �������.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "������ ������� %u ����� ���� ������ � ��� ������ �� LF\n"
@@ -4138,15 +4670,14 @@ msgid "skipped: secret key already present\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
 "����� ������� ��� ���������!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4165,26 +4696,32 @@ msgstr "%s: ������� ��������\n"
 msgid "Enter new filename"
 msgstr "�������������� ��� ��� ����� �������"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "������� ���� stdout\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "������� �������������� ��������� ��� `%s'\n"
 
-#: g10/openfile.c:326
+#: g10/openfile.c:349
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "������������� ��� ������ �������� `%s'\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: ��������� �������������\n"
@@ -4211,46 +4748,46 @@ msgstr ""
 "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
 "��� %d �����!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "� DSA ������� �� ����� ���� 160 bit ���������� hash\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(����� ��� ������������� ��� ������ ��� ���������)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "�������� ����� ��� �������� ��� �� ����������; "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "���� ����� ��� ������� ������! - ������� �� ���������; "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "���������� ����������� ������������-���������\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "������� ��� ������� ������ ��� �� ������� ������ \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4261,7 +4798,7 @@ msgstr ""
 "������������,\n"
 "��� ���� ������ �� ����� �� ��� (������� �������������) ����-��������������."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4275,73 +4812,38 @@ msgstr ""
 "������\n"
 "���� ����� �����������\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr ""
 "��� ������ �� ��������������� ���� �� ��������� ������, ��������� \"yes\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "��� ������ �� ��������������� ���� �� �� ������������ ������, ��������� \"yes"
 "\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "�������������� �� user ID ��� �������� ����� ��� ������ �� �������� ������."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"�������� ��� ��������� ��� ������ �� ���������������.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (������ ������� ��� DSS) ����� � ���������� �������� ���������\n"
-"��� ������ �� �������������� ���� ��� ���������.  ����� � �������������\n"
-"���������� ������ � ���������� ��� DSA ��������� ����� �������� ���\n"
-"��� ��������� ����� ElGamal.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal ����� ���� ���������� ��� ����� ��� �� ��������� ��� ��� ������-\n"
-"�������. �� OpenPGP ��������� ��� ��� \"�������\" ����� ��� ����������:\n"
-"��� ��������������-���� ��� ��� ���������-���-��������������, ����\n"
-"�������������� ����� � �����, ���� ������� ���������� ������ �� ���������\n"
-"�� ��� ������ ����� ��� �� ������������ ��� ������� ������ ��� ���������.\n"
-"���� �� ��������� �� �����, ���� �� ����� OpenPGP ����������� ���\n"
-"����� ���������� �� ������������� ���� �� ��������� (�����).\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"�� ����� (��������) ������ ������ �� ����� ������� ��� ������ ����� ���\n"
-"��������. ����� ����� � ����� ��� ��� ����� � ��������������-����\n"
-"������ ElGamal ��� ����� ��������� �� ���� �� �����."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"�� ��� ���� �� ������� ������������� ��� RFC2440 ��� ������������\n"
-"������ ��� �������������� ��� ��� �� ����������� ��� �� ��������� ���\n"
-"����� ������������ ��� ���� ����� ������� ��� ���� ����� ���� ����������."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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"
@@ -4351,16 +4853,16 @@ msgstr ""
 "��� �������������. ����� � ���������� ������ �� ��������������� ���� ��\n"
 "���������� ������. � �������� ���� ������� �� ������ ��������� ����������."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "�������������� �� ������� ��� ��������"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "��������� \"yes\"(���) � \"no\"(���)"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4372,19 +4874,19 @@ msgstr ""
 "��� �� ������ ��� ���� �������� ��������� - �������� �� �������\n"
 "��������� �� ���������� ��� ���� ��� ��������."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "�������������� �� ����� ��� �������������"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "�������������� ����������� ��� ��������� email (����������)"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "�������� ����������� �������������� ��� ������"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4398,13 +4900,13 @@ msgstr ""
 "O  ��� �������� ��� ����������� ��������.\n"
 "Q  ��� �� ����������� �� ���������� ��������."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr ""
 "��������� \"yes\" (� ���� \"y\") ��� ����� ������� �� ������������ �� "
 "���������."
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 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"
@@ -4476,11 +4978,11 @@ msgstr ""
 "\n"
 "��� ��� ������ ���� ����� � ����� ��������, ����� \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "��������� \"yes\" ��� ������ �� ���������� ��� �� user ID"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4488,11 +4990,11 @@ msgstr ""
 "��������� \"yes\" ��� ���������� ������ �� ��������� ����\n"
 "�� user ID.  ��� �� ������������� �� ������ ����!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "��������� \"yes\" ��� ����� ������� �� ��������� �� ���������"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4503,7 +5005,7 @@ msgstr ""
 "��������� ��� �������� ������������ ��� ������ � �� ��� ���� ������\n"
 "������������� ��� ����."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4515,7 +5017,7 @@ msgstr ""
 "��������������� ����� ���� �� ������ ��������� ������ �� ����������\n"
 "��� ������� ������������ ���� ���� ����� ��� �������������� ��������."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4523,7 +5025,7 @@ msgstr ""
 "� �������� ��� ����� ������.  ����� ������ �� ��������� ��� ��\n"
 "���������� ���."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4537,7 +5039,7 @@ msgstr ""
 "�� ������ ���.  ����� �� ���������� ���� ��� ���� � ����-�������� ���\n"
 "������ ���� ��� ����� ������ � ������� ��� �������."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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"
@@ -4547,23 +5049,23 @@ msgstr ""
 "���� ������������ ����� �����������.  � ���������� ���� ��� ������������\n"
 "����-��������� �� ������� ���� 1 ������������.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "�������� ����������� �� ��������� ����� ������, ��� ��������."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr "����� �� ����� ��� ������� ��� ����� ����������� � ��������"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��������� \"yes\" ��� ����� ������� �� ����������� �� ������"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4571,7 +5073,7 @@ msgstr ""
 "�������� �������� ��� ��� ����� �������. ��� ���� �������� RETURN\n"
 "�� ��'������� ������ (������������� ���� �������) �� ��������������."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4599,7 +5101,7 @@ msgstr ""
 "      ��������������� ���� ��� �� �������� ��� �� user ID ��� ������\n"
 "      �� ��������������� ���. ��� �� ������� ����� ��� ��������� email.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4610,64 +5112,628 @@ msgstr ""
 "�������� �������� ���� �� ������� ���������. ��� ����� ������\n"
 "����� �� �������.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "��� ������� ��������� �������"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�������������: 2 ������ �� ������������� ����������� ��������.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ����� �� ����������\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ����� �� ���\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "�������� ��������� ���� ��� ������ \"�����\" ���������\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "������� ����������� `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu ������� ����� ����� ���� �������� (%lu ���������)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"�������� ��� ������ ��� �� photo ID.  � ������ ���� ������ �� ����� ������\n"
+"JPEG. ��������� ��� � ������ ������������ ���� ��� ������� ������ ���.  ���\n"
+"�������������� ��� ������ ������ �� ������ ��� ���������� �� ����� ������!\n"
+"������� ������� ��� ��� ������ ����� ���� ����� ��� 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "�������������� ��� ����� ������� ��� �� photo ID: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "�������� ��������� ��� ����������� \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "������� ������ ����� �� �� ���������������; (y/N) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" ��� ����� JPEG ������\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "����� ���� � ���������� ����� (y/N/q); "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "�������� ����������� ��� photo ID!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "��� ������������ � ������������� �������� ������������\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "�������� ����������� ��������� `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"�� ������� ���������� ������������ ����������������� ���� ��������� ������\n"
+"�������\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"���� � ��������� ������� ������. ������ ���� ����� ���������� ������������\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "�������� ��������� ��� %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "������ ���������� ���� ��� ����� ���������� ������������: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "������� ������ ��� ���������� ������������\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "�������� ��������� ��� ���������� ������������\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "�������� ��������� ��� ��������� ��� ���������� ������������: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "����     "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet �������: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "���� �������� ���:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(���� ����� ��� ��������� ������ ���������)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "������������ ������ �� ����������� ASCII.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet �������: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "������������� ��������� �������������.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "�� ������� ������ `%s' �� �������: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "������ ��������� ������� ������: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "�������� ���������� ����������\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "��������: ���� �� ������ ��� �������������!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"�� ������������� ��������� �������������.\n"
+"\n"
+"�������� ������������ �� �� ��� ���� ��� ������ �� ������� ������ ��� �\n"
+"Mallory ��������� �������� �� ���� �� ������������� ������ �� �����������\n"
+"�� ������ ���. ����� ������ �� �������� ���� �� ������������� ��� �� ��\n"
+"�������� ������, ��� ��� ��������� ��� �� ���� ��� ��������� ���.  ����\n"
+"������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
+"�������� ��� �� ��� ����� ��������� �� ������!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "�������"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "����� ��� ��������: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(��� ������ ���������)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "����� ���� �������; "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# ����� ��� ������������ ����� ������������, ������������� %s\n"
+"# (����� ��� \"gpg --import-ownertrust\" ��� ��������� ����)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "�������� ��������� ��� �������: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "� ������ ����� ���� ������\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "������: ������ � ��� ��� ���� ������\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "������: �� ������ ���������\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "������: ������ ���� ������������ ���������\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "������ ���� ������ ��� �������� ������������: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "������ ���������: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "�������������: �������� `%s' ��� ����� ����� ��� OpenPGP. ����� �� "
+#~ "������� ��� ��� ����� ���!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[������]|������������� �������"
+
+#~ msgid "store only"
+#~ msgstr "���������� ����"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[������]|���������������� �������"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "�������� ���� �������� ��-�����������"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "�������� ���� �������� ������ ��� ��-�����������"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "���������� ���� ��� ���������� �������"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "������� ��� ����� ������������"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "�������� ��� ����� ������������"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "�������� ��� �������������� ����� ��������� ������������"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "�������� ���� ��������� ����� ��������� ������������"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "��������-��������� ���� ������� � stdin"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "��������-��������� ���� ������� � stdin"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|�����|����� ��� �������� �� ��������������� ���������"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "�� ����� ����������"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "������������ ������ v3 ���������"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "��� ������������ ������ v3 ���������"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "������������ ������ v4 ���������"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "��� ������������ ������ v4 ���������"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "����� ������� MDC ��� �������������"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "���� ����� MDC ��� �������������"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "����� ��� gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "��������� batch: �� �� �������� ���������"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "�������� ��� ���� ������������ ���������"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "�������� ��� ���� ������������ ���������"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "�������� ����� ��� �������� ����������� ��� �����"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|�����|����� �������� ��� �������������� ������� ������"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
+
+#~ msgid "read options from file"
+#~ msgstr "�������� �������� ��� ������"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[������]|������� ��� ����������� ���������� ��� ������"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KEYID|������� ����������� �� ���� �� ������"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|������|������� ��� ���������� ��������� ������"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "��������� ��� ���������� ��� ������������ ��� RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "����������� ���� ��� �������� ������,���������� ��� �������� �� OPENPGP"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "������� ���� ��� �������� ������,����������,�������� �� PGP 2.x "
+#~ "�����������"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|����� ��� ���������� ������ ������ N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|ONOMA|����� ��� ���������� ��������� ��������� ����� ��� ������� �������"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|�����|����� ���������� �������������� �����"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|�����|����� ���������� ��������� ��������� ����� "
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|����� ���������� ��������� N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "�������� ��� ������ keyid ��� ���������������� �������"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "���������� ��� Photo ID"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "�� ���������� ��� Photo ID"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "������� ��� ������� ������� ��� ���������� ��� Photo ID"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "� ���������� ��������� `%s' ����� �� ���� ��� ������ ��� �������� ����\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "� ���������� ��������� ������ �� ����� ������ %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: ��� ����� ������ ��� ���� �� ������ ������ ���� ���������\n"
+#~ "���� �� ���� ���������� ������� �����\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "� ���������� %c%lu ��� ����� ������\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "������ %08lX: ��� ����� ��� rfc2440 ������ - ������������\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "��������: ���������� ����������� �������� Elgamal - ���� ����� ���� "
+#~ "�����\n"
+#~ "          ��� ��� �������� ���\n"
+
+#~ msgid " (default)"
+#~ msgstr " (��������������)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  ����������: %s ����: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "��������: "
+
+#~ msgid "Policy: "
+#~ msgstr "��������: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "������ �������� %08lX ��� �� %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "�������� ����� ��� �������� ��� �� ����������: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "������ ��� �������� ���� �� `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "�������� ��� ��������� ��� `%s' (���������=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "�������� ���� �������� ���� �� `%s': ���������=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "����� � keyserver ��� ����������� --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "�������� ���������� ����������: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "������ %08lX: ���� ����� ��� ���������� ��� PGP ElGamal ������ �� �����\n"
+#~ "              ��� ����� ������� ��� ���������!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "�� ������ %08lX ������������� %lu ������������ ��� ������ (��������� �\n"
+#~ "����� �������� ��� �����)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "�� ������ %08lX ������������� %lu ������������ ��� ������ (��������� �\n"
+#~ "����� �������� ��� �����)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "�� ������ %08lX ���������� ��� �������� ������������.\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "�������� ��� Elgamal ��������� ������ %08lX �� %08lX ����������\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "�������� ��� %08lX �� Elgamal ��������� ������ %08lX ����������\n"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "�������� ��� ��������� ��� ������ �� ���������������.\n"
+#~ "\n"
+#~ "DSA (������ ������� ��� DSS) ����� � ���������� �������� ���������\n"
+#~ "��� ������ �� �������������� ���� ��� ���������.  ����� � �������������\n"
+#~ "���������� ������ � ���������� ��� DSA ��������� ����� �������� ���\n"
+#~ "��� ��������� ����� ElGamal.\n"
+#~ "\n"
+#~ "ElGamal ����� ���� ���������� ��� ����� ��� �� ��������� ��� ��� ������-\n"
+#~ "�������. �� OpenPGP ��������� ��� ��� \"�������\" ����� ��� ����������:\n"
+#~ "��� ��������������-���� ��� ��� ���������-���-��������������, ����\n"
+#~ "�������������� ����� � �����, ���� ������� ���������� ������ �� "
+#~ "���������\n"
+#~ "�� ��� ������ ����� ��� �� ������������ ��� ������� ������ ��� "
+#~ "���������.\n"
+#~ "���� �� ��������� �� �����, ���� �� ����� OpenPGP ����������� ���\n"
+#~ "����� ���������� �� ������������� ���� �� ��������� (�����).\n"
+#~ "\n"
+#~ "�� ����� (��������) ������ ������ �� ����� ������� ��� ������ ����� ���\n"
+#~ "��������. ����� ����� � ����� ��� ��� ����� � ��������������-����\n"
+#~ "������ ElGamal ��� ����� ��������� �� ���� �� �����."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "�� ��� ���� �� ������� ������������� ��� RFC2440 ��� ������������\n"
+#~ "������ ��� �������������� ��� ��� �� ����������� ��� �� ��������� ���\n"
+#~ "����� ������������ ��� ���� ����� ������� ��� ���� ����� ���� ����������."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu ������� ����� ����� ���� �������� (%lu ���������)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "������ ��������\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "������ %08lX ��������\n"
diff --git a/po/[email protected] b/po/[email protected]
index a86703e02..dc569d482 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.3.6\n"
+"Project-Id-Version: gnupg 1.3.90-cvs\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-05-22 13:30+0200\n"
-"PO-Revision-Date: 2004-05-22 13:30+0200\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-07-27 17:15+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -73,7 +73,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:348 g10/keyedit.c:1122
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "quit"
 
@@ -327,7 +327,7 @@ msgstr "you found a bug ... (%s:%d)\n"
 msgid "no entropy gathering module detected\n"
 msgstr "no entropy gathering module detected\n"
 
-#: cipher/random.c:387 g10/keygen.c:2028 g10/import.c:169
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "can't open ‘%s’: %s\n"
@@ -602,19 +602,19 @@ msgstr "do not make any changes"
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/g10.c:506
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/g10.c:507
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr "generate PGP 2.x compatible messages"
 
-#: g10/g10.c:529
+#: g10/g10.c:530
 msgid "allow the use of admin card commands"
 msgstr "allow the use of admin card commands"
 
-#: g10/g10.c:534
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -622,7 +622,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/g10.c:537
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -642,15 +642,15 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/g10.c:712 g10/gpgv.c:91
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Please report bugs to <[email protected]>.\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Usage: gpg [options] [files] (-h for help)"
 
-#: g10/g10.c:732
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -660,7 +660,7 @@ msgstr ""
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -668,71 +668,71 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/g10.c:746
+#: g10/g10.c:747
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:752 g10/keyedit.c:1721
+#: g10/g10.c:753 g10/keyedit.c:1737
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:764 g10/keyedit.c:1767
+#: g10/g10.c:765 g10/keyedit.c:1783
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:847
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "usage: gpg [options] "
 
-#: g10/g10.c:950
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/g10.c:968
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = sign found in group definition “%s”\n"
 
-#: g10/g10.c:1165
+#: g10/g10.c:1166
 #, c-format
 msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "WARNING: unsafe ownership on homedir “%s”\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1169
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
 msgstr "WARNING: unsafe ownership on configuration file “%s”\n"
 
-#: g10/g10.c:1171
+#: g10/g10.c:1172
 #, c-format
 msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "WARNING: unsafe ownership on extension “%s”\n"
 
-#: g10/g10.c:1177
+#: g10/g10.c:1178
 #, c-format
 msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
 msgstr "WARNING: unsafe permissions on homedir “%s”\n"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1181
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "WARNING: unsafe permissions on configuration file “%s”\n"
 
-#: g10/g10.c:1183
+#: g10/g10.c:1184
 #, c-format
 msgid "WARNING: unsafe permissions on extension \"%s\"\n"
 msgstr "WARNING: unsafe permissions on extension “%s”\n"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1190
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir “%s”\n"
 
-#: g10/g10.c:1192
+#: g10/g10.c:1193
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
@@ -740,19 +740,19 @@ msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file “%s"
 "[0m”\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1196
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on extension “%s”\n"
 
-#: g10/g10.c:1201
+#: g10/g10.c:1202
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on homedir “%s”\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1205
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file \"%s"
@@ -761,373 +761,373 @@ msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file “%s"
 "[0m”\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1208
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on extension “%s”\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1334
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "unknown configuration item “%s”\n"
 
-#: g10/g10.c:1600
+#: g10/g10.c:1601
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: old default options file ‘%s’ ignored\n"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: no default option file ‘%s’\n"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "option file ‘%s’: %s\n"
 
-#: g10/g10.c:1647
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: g10/g10.c:1873 g10/g10.c:2408 g10/g10.c:2419
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s is not for normal use!\n"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "cipher extension “%s” not loaded due to unsafe permissions\n"
 
-#: g10/g10.c:2098
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is not a valid character set\n"
 
-#: g10/g10.c:2117 g10/keyedit.c:3212
+#: g10/g10.c:2118 g10/keyedit.c:3228
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/g10.c:2123
+#: g10/g10.c:2124
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2127
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/g10.c:2133
+#: g10/g10.c:2134
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/g10.c:2136
+#: g10/g10.c:2137
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/g10.c:2143
+#: g10/g10.c:2144
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/g10.c:2146
+#: g10/g10.c:2147
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/g10.c:2171
+#: g10/g10.c:2172
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/g10.c:2174
+#: g10/g10.c:2175
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2198
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/g10.c:2200
+#: g10/g10.c:2201
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/g10.c:2207
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/g10.c:2397
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/g10.c:2413
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/g10.c:2434
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
 
-#: g10/g10.c:2440
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 
-#: g10/g10.c:2446
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 
-#: g10/g10.c:2459
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 
-#: g10/g10.c:2527 g10/g10.c:2551
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/g10.c:2533 g10/g10.c:2557
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2540
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/g10.c:2545
+#: g10/g10.c:2546
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/g10.c:2560
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/g10.c:2562
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/g10.c:2564
+#: g10/g10.c:2565
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/g10.c:2566
+#: g10/g10.c:2567
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/g10.c:2568
+#: g10/g10.c:2569
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/g10.c:2575
+#: g10/g10.c:2576
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/g10.c:2582
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/g10.c:2591
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/g10.c:2595
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/g10.c:2599
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/g10.c:2632
+#: g10/g10.c:2633
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2680
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use cipher algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2685
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use digest algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2689
+#: g10/g10.c:2690
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use compression algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/g10.c:2788
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/g10.c:2799
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2806
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:2831
+#: g10/g10.c:2832
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filename]"
 
-#: g10/g10.c:2833
+#: g10/g10.c:2834
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2837
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 
-#: g10/g10.c:2854
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:2882
+#: g10/g10.c:2883
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filename]"
 
-#: g10/g10.c:2884
+#: g10/g10.c:2885
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/g10.c:2887
+#: g10/g10.c:2888
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 
-#: g10/g10.c:2907
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:2916
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:2949
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2957
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:3041 g10/encode.c:474 g10/sign.c:891
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "can't open %s: %s\n"
 
-#: g10/g10.c:3056
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3094
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/g10.c:3095
+#: g10/g10.c:3096
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/g10.c:3097
+#: g10/g10.c:3098
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/g10.c:3118
+#: g10/g10.c:3119
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/g10.c:3159
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/g10.c:3254
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/g10.c:3377
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3381
+#: g10/g10.c:3382
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/g10.c:3384 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "can't open ‘%s’\n"
 
-#: g10/g10.c:3658
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1135,23 +1135,23 @@ msgstr ""
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘=’\n"
 
-#: g10/g10.c:3667
+#: g10/g10.c:3668
 msgid "a user notation name must contain the '@' character\n"
 msgstr "a user notation name must contain the ‘@’ character\n"
 
-#: g10/g10.c:3677
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "a notation value must not use any control characters\n"
 
-#: g10/g10.c:3711
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/g10.c:3713
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/g10.c:3746
+#: g10/g10.c:3747
 msgid "the given signature preferred keyserver URL is invalid\n"
 msgstr "the given signature preferred keyserver URL is invalid\n"
 
@@ -1212,7 +1212,7 @@ msgstr "invalid dash escaped line: "
 msgid "unexpected armor:"
 msgstr "unexpected armor:"
 
-#: g10/armor.c:695 g10/armor.c:1277
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
@@ -1229,7 +1229,7 @@ msgstr "premature eof (in CRC)\n"
 msgid "malformed CRC\n"
 msgstr "malformed CRC\n"
 
-#: g10/armor.c:780 g10/armor.c:1314
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC error; %06lx - %06lx\n"
@@ -1242,67 +1242,66 @@ msgstr "premature eof (in Trailer)\n"
 msgid "error in trailer line\n"
 msgstr "error in trailer line\n"
 
-#: g10/armor.c:1092
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "no valid OpenPGP data found.\n"
 
-#: g10/armor.c:1097
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "invalid armor: line longer than %d characters\n"
 
-#: g10/armor.c:1101
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:576
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/pkclist.c:67 g10/revoke.c:577
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/pkclist.c:69 g10/revoke.c:579
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/pkclist.c:71 g10/revoke.c:580
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/pkclist.c:75
+#: g10/pkclist.c:73
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/pkclist.c:92
+#: g10/pkclist.c:90
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/pkclist.c:197
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:205
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
-msgstr ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
 
-#: g10/pkclist.c:234 g10/mainproc.c:1536
-msgid "                aka \""
-msgstr "                aka \""
+#: g10/pkclist.c:207
+msgid "          \""
+msgstr "          \""
+
+#: g10/pkclist.c:234
+msgid "      aka \""
+msgstr "      aka \""
 
-#: g10/pkclist.c:245 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1314,48 +1313,48 @@ msgstr ""
 "checking fingerprints from different sources...)?\n"
 "\n"
 
-#: g10/pkclist.c:249
+#: g10/pkclist.c:250
 #, c-format
 msgid " %d = I don't know or won't say\n"
 msgstr " %d = I don't know or won't say\n"
 
-#: g10/pkclist.c:251
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = I do NOT trust\n"
 
-#: g10/pkclist.c:253
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = I trust marginally\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = I trust fully\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = I trust ultimately\n"
 
-#: g10/pkclist.c:260
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = please show me more information\n"
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = back to the main menu\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = skip this key\n"
 
-#: g10/pkclist.c:267
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = quit\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -1364,61 +1363,61 @@ msgstr ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 
-#: g10/pkclist.c:277 g10/revoke.c:605
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Your decision? "
 
-#: g10/pkclist.c:298
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Do you really want to set this key to ultimate trust? "
 
-#: g10/pkclist.c:312
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificates leading to an ultimately trusted key:\n"
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "key %08lX: key has been revoked!\n"
 
-#: g10/pkclist.c:393 g10/pkclist.c:405 g10/pkclist.c:504
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Use this key anyway? "
 
-#: g10/pkclist.c:398
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "key %08lX: subkey has been revoked!\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: key has expired\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, c-format
 msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: There is no assurance this key belongs to the named user\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: We do NOT trust this key\n"
 
-#: g10/pkclist.c:440
+#: g10/pkclist.c:441
 #, c-format
 msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: There is limited assurance this key belongs to the named user\n"
 
-#: g10/pkclist.c:446
+#: g10/pkclist.c:447
 msgid "This key probably belongs to the named user\n"
 msgstr "This key probably belongs to the named user\n"
 
-#: g10/pkclist.c:451
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "This key belongs to us\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -1430,90 +1429,90 @@ msgstr ""
 "you may answer the next question with yes\n"
 "\n"
 
-#: g10/pkclist.c:513 g10/pkclist.c:543
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNING: Using untrusted key!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "WARNING: this key might be revoked (revocation key not present)\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "WARNING: This key has been revoked by its designated revoker!\n"
 
-#: g10/pkclist.c:562
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNING: This key has been revoked by its owner!\n"
 
-#: g10/pkclist.c:563
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         This could mean that the signature is forgery.\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNING: This subkey has been revoked by its owner!\n"
 
-#: g10/pkclist.c:574
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: This key has been disabled.\n"
 
-#: g10/pkclist.c:579
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Note: This key has expired!\n"
 
-#: g10/pkclist.c:590
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNING: This key is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         There is no indication that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNING: We do NOT trust this key!\n"
 
-#: g10/pkclist.c:601
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         The signature is probably a FORGERY.\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 
-#: g10/pkclist.c:611
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:763 g10/pkclist.c:799 g10/encode.c:791
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "you may not use %s while in %s mode\n"
 
-#: g10/pkclist.c:776 g10/pkclist.c:809 g10/pkclist.c:978 g10/pkclist.c:1038
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:786 g10/pkclist.c:1010
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "You did not specify a user ID. (you may use “-r”)\n"
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "Current recipients:\n"
 msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1521,33 +1520,33 @@ msgstr ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:891 g10/pkclist.c:953
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:916
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:945
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "unknown default recipient ‘%s’\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:1045
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
@@ -1573,71 +1572,71 @@ msgstr "too many compression preferences\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:773
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:819
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:881 g10/keygen.c:965 g10/keygen.c:1056
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:886 g10/keygen.c:970 g10/keygen.c:1061
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1161
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/keygen.c:1163
+#: g10/keygen.c:1167
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA and Elgamal (default)\n"
 
-#: g10/keygen.c:1164
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign only)\n"
 
-#: g10/keygen.c:1166
+#: g10/keygen.c:1170
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (encrypt only)\n"
 
-#: g10/keygen.c:1167
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sign only)\n"
 
-#: g10/keygen.c:1169
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (sign and encrypt)\n"
 
-#: g10/keygen.c:1174 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/keygen.c:1208 g10/keyedit.c:800 g10/revoke.c:638
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1650,28 +1649,28 @@ msgstr ""
 "              default keysize is 1024 bits\n"
 "    highest suggested keysize is 2048 bits\n"
 
-#: g10/keygen.c:1230
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "What keysize do you want? (1024) "
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA only allows keysizes from 512 to 1024\n"
 
-#: g10/keygen.c:1237
+#: g10/keygen.c:1241
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n"
 
-#: g10/keygen.c:1240
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize too small; 768 is smallest value allowed.\n"
 
-#: g10/keygen.c:1251
+#: g10/keygen.c:1255
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize too large; %d is largest value allowed.\n"
 
-#: g10/keygen.c:1256
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1679,11 +1678,11 @@ msgstr ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 
-#: g10/keygen.c:1259
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Are you sure that you want this keysize? "
 
-#: g10/keygen.c:1260
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1691,17 +1690,17 @@ msgstr ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 
-#: g10/keygen.c:1269
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:1272 g10/keygen.c:1276
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1717,7 +1716,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:1336
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1733,29 +1732,29 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Signature is valid for? (0) "
 
-#: g10/keygen.c:1365
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:1370
+#: g10/keygen.c:1374
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s does not expire at all\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expires at %s\n"
 
-#: g10/keygen.c:1383
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1763,11 +1762,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:1388
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Is this correct (y/n)? "
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1783,44 +1782,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:1463
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:1482
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:1488
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:1511
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:1517
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1831,27 +1830,27 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1526
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
-#: g10/keygen.c:1527
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1541
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:1538
+#: g10/keygen.c:1542
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1557
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1859,16 +1858,16 @@ msgstr ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 
-#: g10/keygen.c:1605 g10/keyedit.c:1005
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase not correctly repeated; try again"
 
-#: g10/keygen.c:1606
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1616
 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"
@@ -1880,7 +1879,7 @@ msgstr ""
 "using this program with the option “--edit-key”.\n"
 "\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1638
 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"
@@ -1892,58 +1891,58 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:2202 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
 msgid "sorry, can't do this in batch mode\n"
 msgstr "sorry, can't do this in batch mode\n"
 
-#: g10/keygen.c:2263
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA keypair will have 1024 bits.\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:2447 g10/keygen.c:2572
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:2449 g10/keygen.c:2575
+#: g10/keygen.c:2453 g10/keygen.c:2579
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "writing secret key stub to ‘%s’\n"
 
-#: g10/keygen.c:2452 g10/keygen.c:2578
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "writing secret key to ‘%s’\n"
 
-#: g10/keygen.c:2561
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "no writable secret keyring found: %s\n"
 
-#: g10/keygen.c:2585
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error writing public keyring ‘%s’: %s\n"
 
-#: g10/keygen.c:2592
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error writing secret keyring ‘%s’: %s\n"
 
-#: g10/keygen.c:2615
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:2626
+#: g10/keygen.c:2630
 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"
@@ -1952,30 +1951,30 @@ msgstr ""
 "the command “--edit-key” to generate a secondary key for this "
 "purpose.\n"
 
-#: g10/keygen.c:2638 g10/keygen.c:2751
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:2687 g10/sign.c:290
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:2689 g10/sign.c:292
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:2698
+#: g10/keygen.c:2702
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:2726
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Really create? "
 
@@ -2043,7 +2042,7 @@ msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s encrypted for: “%s”\n"
 
-#: g10/export.c:162 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "key ‘%s’ not found: %s\n"
@@ -2545,27 +2544,27 @@ msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID “%s” is revoked."
 
-#: g10/keyedit.c:500 g10/keyedit.c:520 g10/keyedit.c:541 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1354
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
-#: g10/keyedit.c:508 g10/keyedit.c:528 g10/keyedit.c:549 g10/keyedit.c:698
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:519
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID “%s” is expired."
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID “%s” is not self-signed."
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2574,11 +2573,11 @@ msgstr ""
 "The self-signature on “%s”\n"
 "is a PGP 2.x-style signature.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:607
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2587,12 +2586,12 @@ msgstr ""
 "Your current signature on “%s”\n"
 "has expired.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:611
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Do you want to issue a new signature to replace the expired one? (y/N) "
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2601,43 +2600,43 @@ msgstr ""
 "Your current signature on “%s”\n"
 "is a local signature.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 
-#: g10/keyedit.c:641
+#: g10/keyedit.c:657
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s” was already locally signed by key %s\n"
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:660
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s” was already signed by key %s\n"
 
-#: g10/keyedit.c:649
+#: g10/keyedit.c:665
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Do you want to sign it again anyway? (y/N) "
 
-#: g10/keyedit.c:671
+#: g10/keyedit.c:687
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nothing to sign with key %s\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "This key has expired!"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "This key is due to expire on %s.\n"
 
-#: g10/keyedit.c:710
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Do you want your signature to expire at the same time? (Y/n) "
 
-#: g10/keyedit.c:743
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2645,11 +2644,11 @@ msgstr ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 
-#: g10/keyedit.c:745
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "This would make the key unusable in PGP 2.x.\n"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2660,31 +2659,31 @@ msgstr ""
 "to the person named above?  If you don't know what to answer, enter “0"
 "[0m”.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) I will not answer.%s\n"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) I have not checked at all.%s\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) I have done casual checking.%s\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) I have done very careful checking.%s\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:803
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Your selection? (enter ‘?’ for more information): "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2692,7 +2691,7 @@ msgstr ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2700,7 +2699,7 @@ msgstr ""
 "\n"
 "This will be a self-signature.\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2708,7 +2707,7 @@ msgstr ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2716,7 +2715,7 @@ msgstr ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2724,7 +2723,7 @@ msgstr ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2732,7 +2731,7 @@ msgstr ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2740,7 +2739,7 @@ msgstr ""
 "\n"
 "I have not checked this key at all.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2748,7 +2747,7 @@ msgstr ""
 "\n"
 "I have checked this key casually.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2756,34 +2755,34 @@ msgstr ""
 "\n"
 "I have checked this key very carefully.\n"
 
-#: g10/keyedit.c:861
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Really sign? "
 
-#: g10/keyedit.c:906 g10/keyedit.c:3632 g10/keyedit.c:3723 g10/keyedit.c:3796
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "This key is not protected.\n"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Secret parts of primary key are not available.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "Key is protected.\n"
 
-#: g10/keyedit.c:990
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Can't edit this key: %s\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2791,7 +2790,7 @@ msgstr ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2799,538 +2798,538 @@ msgstr ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Do you really want to do this? "
 
-#: g10/keyedit.c:1079
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "moving a key signature to the correct place\n"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "save and quit"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "show fingerprint"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "list key and user IDs"
 
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "select user ID N"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "select secondary key N"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "list signatures"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "sign the key"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:1136
+#: g10/keyedit.c:1152
 msgid "tsign"
 msgstr "tsign"
 
-#: g10/keyedit.c:1136
+#: g10/keyedit.c:1152
 msgid "make a trust signature"
 msgstr "make a trust signature"
 
-#: g10/keyedit.c:1137
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:1137
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "sign the key locally"
 
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "sign the key non-revocably"
 
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "sign the key locally and non-revocably"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "add a user ID"
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "add a photo ID"
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "delete user ID"
 
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "add a secondary key"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "delete a secondary key"
 
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1164
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
 msgstr "add a revocation key"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "delete signatures"
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "change the expire date"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "flag user ID as primary"
 
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "toggle between secret and public key listing"
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "list preferences (expert)"
 
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "list preferences (verbose)"
 
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "set preference list"
 
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "updated preferences"
 
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1175
 msgid "keyserver"
 msgstr "keyserver"
 
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1175
 msgid "set preferred keyserver URL"
 msgstr "set preferred keyserver URL"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "change the passphrase"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "change the ownertrust"
 
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revoke signatures"
 
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1179
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1179
 msgid "revoke a user ID"
 msgstr "revoke a user ID"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revoke a secondary key"
 
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "disable a key"
 
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "enable a key"
 
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "show photo ID"
 
-#: g10/keyedit.c:1186 g10/delkey.c:120
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "can't do that in batchmode\n"
 
-#: g10/keyedit.c:1217
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error reading secret keyblock ‘%s’: %s\n"
 
-#: g10/keyedit.c:1234
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Command> "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Need the secret key to do this.\n"
 
-#: g10/keyedit.c:1300
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Please use the command “toggle” first.\n"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Really sign all user IDs? "
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Select the user IDs to sign\n"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/keyedit.c:1415 g10/keyedit.c:1436 g10/keyedit.c:1495
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "You must select at least one user ID.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "You can't delete the last user ID!\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Really remove all selected user IDs? "
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Really remove this user ID? "
 
-#: g10/keyedit.c:1459 g10/keyedit.c:1514
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "You must select at least one key.\n"
 
-#: g10/keyedit.c:1462
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Do you really want to delete the selected keys? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Do you really want to delete this key? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1514
 msgid "Really revoke all selected user IDs? "
 msgstr "Really revoke all selected user IDs? "
 
-#: g10/keyedit.c:1499
+#: g10/keyedit.c:1515
 msgid "Really revoke this user ID? "
 msgstr "Really revoke this user ID? "
 
-#: g10/keyedit.c:1518
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Do you really want to revoke the selected keys? "
 
-#: g10/keyedit.c:1519
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Do you really want to revoke this key? "
 
-#: g10/keyedit.c:1558
+#: g10/keyedit.c:1574
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Owner trust may not be set while using an user provided trust database\n"
 
-#: g10/keyedit.c:1590
+#: g10/keyedit.c:1606
 msgid "Set preference list to:\n"
 msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Really update the preferences for the selected user IDs? "
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Really update the preferences? "
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Save changes? "
 
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Quit without saving? "
 
-#: g10/keyedit.c:1659
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
 
-#: g10/keyedit.c:1666
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "update secret failed: %s\n"
 
-#: g10/keyedit.c:1673
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:1685
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help”)\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1760
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1812
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1823
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2047
+#: g10/keyedit.c:2063
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "This key may be revoked by %s key "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2065 g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2084
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:2070
+#: g10/keyedit.c:2086
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:2072 g10/keyedit.c:2121 g10/keyedit.c:2224 g10/keyedit.c:2239
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2103
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:2091
+#: g10/keyedit.c:2107
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:2098
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:2130
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey has been revoked: %s\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- faked revocation found\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem checking revocation: %s\n"
 
-#: g10/keyedit.c:2160 g10/keylist.c:696 g10/mainproc.c:1544 g10/trustdb.c:1124
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:2162 g10/keylist.c:698 g10/mainproc.c:1546 g10/trustdb.c:499
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:2183
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:2191
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3338,15 +3337,15 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:2256 g10/mainproc.c:923
+#: g10/keyedit.c:2272 g10/mainproc.c:930
 msgid "[revoked] "
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2258
+#: g10/keyedit.c:2274
 msgid "[expired] "
 msgstr "[expired] "
 
-#: g10/keyedit.c:2323
+#: g10/keyedit.c:2339
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3354,7 +3353,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3364,45 +3363,45 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:2388 g10/keyedit.c:2661
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:2543
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:2549
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:2563
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Deleted %d signature.\n"
 
-#: g10/keyedit.c:2564
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:2567
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:2656
+#: g10/keyedit.c:2672
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3412,88 +3411,88 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2683
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2763
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2782
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2788
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 
-#: g10/keyedit.c:2833
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Please remove selections from the secret keys.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Please select at most one secondary key.\n"
 
-#: g10/keyedit.c:2843
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changing expiration time for a secondary key.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:2892
+#: g10/keyedit.c:2908
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "No corresponding signature in secret ring\n"
 
-#: g10/keyedit.c:2988
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3137 g10/keyedit.c:3251
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "skipping v3 self-signature on user id “%s”\n"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3215
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:3315
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No secondary key with index %d\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3496
 #, c-format
 msgid ""
 "\"\n"
@@ -3502,7 +3501,7 @@ msgstr ""
 "\"\n"
 "signed with your key %s at %s\n"
 
-#: g10/keyedit.c:3483
+#: g10/keyedit.c:3499
 #, c-format
 msgid ""
 "\"\n"
@@ -3511,65 +3510,65 @@ msgstr ""
 "\"\n"
 "locally signed with your key %s at %s\n"
 
-#: g10/keyedit.c:3488
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:3492
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:3521
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "You have signed these user IDs:\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3558
 #, c-format
 msgid "   signed by %s on %s%s%s\n"
 msgstr "   signed by %s on %s%s%s\n"
 
-#: g10/keyedit.c:3551
+#: g10/keyedit.c:3567
 #, c-format
 msgid "   revoked by %s on %s\n"
 msgstr "   revoked by %s on %s\n"
 
-#: g10/keyedit.c:3571
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3597
 #, c-format
 msgid "   signed by %s on %s%s\n"
 msgstr "   signed by %s on %s%s\n"
 
-#: g10/keyedit.c:3583
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3590
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:3620
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3706
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s” is already revoked\n"
 
-#: g10/keyedit.c:3707
+#: g10/keyedit.c:3723
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:3876
+#: g10/keyedit.c:3892
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
@@ -3610,39 +3609,39 @@ msgstr "not human readable"
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:629 g10/keylist.c:658 g10/keylist.c:756 g10/keylist.c:781
-#: g10/mainproc.c:925
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, c-format
+msgid " [expired: %s]"
+msgstr " [expired: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expires: %s]"
 
-#: g10/keylist.c:654 g10/keylist.c:752
+#: g10/keylist.c:646 g10/keylist.c:743
 #, c-format
 msgid " [revoked: %s]"
 msgstr " [revoked: %s]"
 
-#: g10/keylist.c:656 g10/keylist.c:754
-#, c-format
-msgid " [expired: %s]"
-msgstr " [expired: %s]"
-
-#: g10/keylist.c:1366
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:1368
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
 msgstr "     Subkey fingerprint:"
 
-#: g10/keylist.c:1375
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:1377
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:1381 g10/keylist.c:1385
+#: g10/keylist.c:1372 g10/keylist.c:1376
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
@@ -3671,174 +3670,183 @@ msgstr "%s encrypted data\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:309
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
+#: g10/mainproc.c:373
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:421
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:455
+#: g10/mainproc.c:462
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:465
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:523 g10/mainproc.c:545
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:531
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: sender requested “for-your-eyes-only”\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:780
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import” to apply\n"
 
-#: g10/mainproc.c:1276
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1318 g10/mainproc.c:1328
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "can't handle these multiple signatures\n"
 
-#: g10/mainproc.c:1338
+#: g10/mainproc.c:1345
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1339
+#: g10/mainproc.c:1346
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:1343
+#: g10/mainproc.c:1350
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature made %s using %s key ID %s\n"
 
-#: g10/mainproc.c:1363
+#: g10/mainproc.c:1370
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:1463 g10/mainproc.c:1499
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "BAD signature from \""
 
-#: g10/mainproc.c:1464 g10/mainproc.c:1500
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Expired signature from \""
 
-#: g10/mainproc.c:1465 g10/mainproc.c:1501
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Good signature from \""
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1631
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                aka \""
+
+#: g10/mainproc.c:1638
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:1636
+#: g10/mainproc.c:1643
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:1639
+#: g10/mainproc.c:1646
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, digest algorithm %s\n"
 
-#: g10/mainproc.c:1640
+#: g10/mainproc.c:1647
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1648
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:1641 g10/trustdb.c:498
+#: g10/mainproc.c:1648 g10/trustdb.c:498
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:1661
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:1729 g10/mainproc.c:1745 g10/mainproc.c:1831
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:1772
+#: g10/mainproc.c:1779
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:1780
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:1837
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
 
-#: g10/mainproc.c:1847
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "invalid root packet detected in proc_tree()\n"
 
@@ -3996,15 +4004,15 @@ msgstr "cancelled by user\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem with the agent: agent returns 0x%lx\n"
 
-#: g10/passphrase.c:1044 g10/passphrase.c:1189
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
 msgid "can't query password in batchmode\n"
 msgstr "can't query password in batchmode\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1193
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
 msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
-#: g10/passphrase.c:1119
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -4014,51 +4022,51 @@ msgstr ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 
-#: g10/passphrase.c:1128
+#: g10/passphrase.c:1140
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s key, ID %s, created %s"
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1149
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subkey on main key ID %s)"
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1153
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (main key ID %s)"
 
-#: g10/passphrase.c:1197
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Repeat passphrase: "
 
-#: g10/plaintext.c:72
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data not saved; use option “--output” to save it\n"
 
-#: g10/plaintext.c:114 g10/plaintext.c:132
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creating ‘%s’: %s\n"
 
-#: g10/plaintext.c:420
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Detached signature.\n"
 
-#: g10/plaintext.c:424
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Please enter name of data file: "
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "reading stdin ...\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "no signed data\n"
 
-#: g10/plaintext.c:487
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "can't open signed data ‘%s’\n"
@@ -4104,20 +4112,25 @@ msgstr "secret key parts are not available\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protection algorithm %d%s is not supported\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:71
+#, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "protection digest %d is not supported\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Invalid passphrase; please try again"
 
-#: g10/seckey-cert.c:245
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:305
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "WARNING: Weak key detected - please change passphrase again.\n"
 
-#: g10/seckey-cert.c:343
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
 
diff --git a/po/[email protected] b/po/[email protected]
index 86b0c7980..30c498abb 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.3.6\n"
+"Project-Id-Version: gnupg 1.3.90-cvs\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-05-22 13:30+0200\n"
-"PO-Revision-Date: 2004-05-22 13:30+0200\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-07-27 17:15+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -70,7 +70,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:348 g10/keyedit.c:1122
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "quit"
 
@@ -324,7 +324,7 @@ msgstr "you found a bug ... (%s:%d)\n"
 msgid "no entropy gathering module detected\n"
 msgstr "no entropy gathering module detected\n"
 
-#: cipher/random.c:387 g10/keygen.c:2028 g10/import.c:169
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "can't open ‘%s’: %s\n"
@@ -599,19 +599,19 @@ msgstr "do not make any changes"
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/g10.c:506
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/g10.c:507
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr "generate PGP 2.x compatible messages"
 
-#: g10/g10.c:529
+#: g10/g10.c:530
 msgid "allow the use of admin card commands"
 msgstr "allow the use of admin card commands"
 
-#: g10/g10.c:534
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -619,7 +619,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/g10.c:537
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -639,15 +639,15 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/g10.c:712 g10/gpgv.c:91
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Please report bugs to <[email protected]>.\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Usage: gpg [options] [files] (-h for help)"
 
-#: g10/g10.c:732
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -657,7 +657,7 @@ msgstr ""
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -665,88 +665,88 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/g10.c:746
+#: g10/g10.c:747
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:752 g10/keyedit.c:1721
+#: g10/g10.c:753 g10/keyedit.c:1737
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:764 g10/keyedit.c:1767
+#: g10/g10.c:765 g10/keyedit.c:1783
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:847
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "usage: gpg [options] "
 
-#: g10/g10.c:950
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/g10.c:968
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = sign found in group definition “%s”\n"
 
-#: g10/g10.c:1165
+#: g10/g10.c:1166
 #, c-format
 msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "WARNING: unsafe ownership on homedir “%s”\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1169
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
 msgstr "WARNING: unsafe ownership on configuration file “%s”\n"
 
-#: g10/g10.c:1171
+#: g10/g10.c:1172
 #, c-format
 msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "WARNING: unsafe ownership on extension “%s”\n"
 
-#: g10/g10.c:1177
+#: g10/g10.c:1178
 #, c-format
 msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
 msgstr "WARNING: unsafe permissions on homedir “%s”\n"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1181
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "WARNING: unsafe permissions on configuration file “%s”\n"
 
-#: g10/g10.c:1183
+#: g10/g10.c:1184
 #, c-format
 msgid "WARNING: unsafe permissions on extension \"%s\"\n"
 msgstr "WARNING: unsafe permissions on extension “%s”\n"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1190
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir “%s”\n"
 
-#: g10/g10.c:1192
+#: g10/g10.c:1193
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file “%s”\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1196
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory ownership on extension “%s”\n"
 
-#: g10/g10.c:1201
+#: g10/g10.c:1202
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory permissions on homedir “%s”\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1205
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file \"%s"
@@ -754,372 +754,372 @@ msgid ""
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file “%s”\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1208
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr "WARNING: unsafe enclosing directory permissions on extension “%s”\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1334
 #, c-format
 msgid "unknown configuration item \"%s\"\n"
 msgstr "unknown configuration item “%s”\n"
 
-#: g10/g10.c:1600
+#: g10/g10.c:1601
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: old default options file ‘%s’ ignored\n"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: no default option file ‘%s’\n"
 
-#: g10/g10.c:1640
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "option file ‘%s’: %s\n"
 
-#: g10/g10.c:1647
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: g10/g10.c:1873 g10/g10.c:2408 g10/g10.c:2419
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s is not for normal use!\n"
 
-#: g10/g10.c:1886
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "cipher extension “%s” not loaded due to unsafe permissions\n"
 
-#: g10/g10.c:2098
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is not a valid character set\n"
 
-#: g10/g10.c:2117 g10/keyedit.c:3212
+#: g10/g10.c:2118 g10/keyedit.c:3228
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/g10.c:2123
+#: g10/g10.c:2124
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2127
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/g10.c:2133
+#: g10/g10.c:2134
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/g10.c:2136
+#: g10/g10.c:2137
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/g10.c:2143
+#: g10/g10.c:2144
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/g10.c:2146
+#: g10/g10.c:2147
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/g10.c:2171
+#: g10/g10.c:2172
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/g10.c:2174
+#: g10/g10.c:2175
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:2198
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/g10.c:2200
+#: g10/g10.c:2201
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/g10.c:2207
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/g10.c:2397
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/g10.c:2410
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/g10.c:2413
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/g10.c:2434
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
 
-#: g10/g10.c:2440
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 
-#: g10/g10.c:2446
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 
-#: g10/g10.c:2459
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 
-#: g10/g10.c:2527 g10/g10.c:2551
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/g10.c:2533 g10/g10.c:2557
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2540
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/g10.c:2545
+#: g10/g10.c:2546
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/g10.c:2560
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/g10.c:2562
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/g10.c:2564
+#: g10/g10.c:2565
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/g10.c:2566
+#: g10/g10.c:2567
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/g10.c:2568
+#: g10/g10.c:2569
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/g10.c:2571
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/g10.c:2575
+#: g10/g10.c:2576
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/g10.c:2582
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/g10.c:2591
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/g10.c:2595
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/g10.c:2599
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/g10.c:2632
+#: g10/g10.c:2633
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2680
 #, c-format
 msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use cipher algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2685
 #, c-format
 msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use digest algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2689
+#: g10/g10.c:2690
 #, c-format
 msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
 msgstr "you may not use compression algorithm “%s” while in %s mode\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/g10.c:2788
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/g10.c:2799
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2806
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:2831
+#: g10/g10.c:2832
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filename]"
 
-#: g10/g10.c:2833
+#: g10/g10.c:2834
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/g10.c:2836
+#: g10/g10.c:2837
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt while in %s mode\n"
 
-#: g10/g10.c:2854
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:2867
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:2882
+#: g10/g10.c:2883
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filename]"
 
-#: g10/g10.c:2884
+#: g10/g10.c:2885
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/g10.c:2887
+#: g10/g10.c:2888
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 
-#: g10/g10.c:2907
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:2916
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:2949
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2953
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2957
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2985
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:3041 g10/encode.c:474 g10/sign.c:891
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "can't open %s: %s\n"
 
-#: g10/g10.c:3056
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:3093
+#: g10/g10.c:3094
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/g10.c:3095
+#: g10/g10.c:3096
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/g10.c:3097
+#: g10/g10.c:3098
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/g10.c:3108
+#: g10/g10.c:3109
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/g10.c:3118
+#: g10/g10.c:3119
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/g10.c:3159
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/g10.c:3167
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/g10.c:3254
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/g10.c:3377
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3381
+#: g10/g10.c:3382
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/g10.c:3384 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "can't open ‘%s’\n"
 
-#: g10/g10.c:3658
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1127,23 +1127,23 @@ msgstr ""
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘=’\n"
 
-#: g10/g10.c:3667
+#: g10/g10.c:3668
 msgid "a user notation name must contain the '@' character\n"
 msgstr "a user notation name must contain the ‘@’ character\n"
 
-#: g10/g10.c:3677
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "a notation value must not use any control characters\n"
 
-#: g10/g10.c:3711
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/g10.c:3713
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/g10.c:3746
+#: g10/g10.c:3747
 msgid "the given signature preferred keyserver URL is invalid\n"
 msgstr "the given signature preferred keyserver URL is invalid\n"
 
@@ -1204,7 +1204,7 @@ msgstr "invalid dash escaped line: "
 msgid "unexpected armor:"
 msgstr "unexpected armor:"
 
-#: g10/armor.c:695 g10/armor.c:1277
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
@@ -1221,7 +1221,7 @@ msgstr "premature eof (in CRC)\n"
 msgid "malformed CRC\n"
 msgstr "malformed CRC\n"
 
-#: g10/armor.c:780 g10/armor.c:1314
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC error; %06lx - %06lx\n"
@@ -1234,67 +1234,66 @@ msgstr "premature eof (in Trailer)\n"
 msgid "error in trailer line\n"
 msgstr "error in trailer line\n"
 
-#: g10/armor.c:1092
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "no valid OpenPGP data found.\n"
 
-#: g10/armor.c:1097
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "invalid armor: line longer than %d characters\n"
 
-#: g10/armor.c:1101
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:576
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/pkclist.c:67 g10/revoke.c:577
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/pkclist.c:69 g10/revoke.c:579
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/pkclist.c:71 g10/revoke.c:580
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/pkclist.c:75
+#: g10/pkclist.c:73
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/pkclist.c:92
+#: g10/pkclist.c:90
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/pkclist.c:197
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:205
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
-msgstr ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
 
-#: g10/pkclist.c:234 g10/mainproc.c:1536
-msgid "                aka \""
-msgstr "                aka \""
+#: g10/pkclist.c:207
+msgid "          \""
+msgstr "          \""
+
+#: g10/pkclist.c:234
+msgid "      aka \""
+msgstr "      aka \""
 
-#: g10/pkclist.c:245 g10/keyedit.c:311
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1306,48 +1305,48 @@ msgstr ""
 "checking fingerprints from different sources...)?\n"
 "\n"
 
-#: g10/pkclist.c:249
+#: g10/pkclist.c:250
 #, c-format
 msgid " %d = I don't know or won't say\n"
 msgstr " %d = I don't know or won't say\n"
 
-#: g10/pkclist.c:251
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = I do NOT trust\n"
 
-#: g10/pkclist.c:253
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = I trust marginally\n"
 
-#: g10/pkclist.c:255
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = I trust fully\n"
 
-#: g10/pkclist.c:257
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = I trust ultimately\n"
 
-#: g10/pkclist.c:260
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = please show me more information\n"
 
-#: g10/pkclist.c:263
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = back to the main menu\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = skip this key\n"
 
-#: g10/pkclist.c:267
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = quit\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:272
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
@@ -1356,61 +1355,61 @@ msgstr ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 
-#: g10/pkclist.c:277 g10/revoke.c:605
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Your decision? "
 
-#: g10/pkclist.c:298
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Do you really want to set this key to ultimate trust? "
 
-#: g10/pkclist.c:312
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificates leading to an ultimately trusted key:\n"
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "key %08lX: key has been revoked!\n"
 
-#: g10/pkclist.c:393 g10/pkclist.c:405 g10/pkclist.c:504
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Use this key anyway? "
 
-#: g10/pkclist.c:398
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "key %08lX: subkey has been revoked!\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: key has expired\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 #, c-format
 msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: There is no assurance this key belongs to the named user\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: We do NOT trust this key\n"
 
-#: g10/pkclist.c:440
+#: g10/pkclist.c:441
 #, c-format
 msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr "%08lX: There is limited assurance this key belongs to the named user\n"
 
-#: g10/pkclist.c:446
+#: g10/pkclist.c:447
 msgid "This key probably belongs to the named user\n"
 msgstr "This key probably belongs to the named user\n"
 
-#: g10/pkclist.c:451
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "This key belongs to us\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -1422,90 +1421,90 @@ msgstr ""
 "you may answer the next question with yes\n"
 "\n"
 
-#: g10/pkclist.c:513 g10/pkclist.c:543
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNING: Using untrusted key!\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
 msgstr "WARNING: this key might be revoked (revocation key not present)\n"
 
-#: g10/pkclist.c:559
+#: g10/pkclist.c:560
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
 msgstr "WARNING: This key has been revoked by its designated revoker!\n"
 
-#: g10/pkclist.c:562
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNING: This key has been revoked by its owner!\n"
 
-#: g10/pkclist.c:563
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         This could mean that the signature is forgery.\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNING: This subkey has been revoked by its owner!\n"
 
-#: g10/pkclist.c:574
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: This key has been disabled.\n"
 
-#: g10/pkclist.c:579
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Note: This key has expired!\n"
 
-#: g10/pkclist.c:590
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNING: This key is not certified with a trusted signature!\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         There is no indication that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNING: We do NOT trust this key!\n"
 
-#: g10/pkclist.c:601
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         The signature is probably a FORGERY.\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 
-#: g10/pkclist.c:611
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         It is not certain that the signature belongs to the owner.\n"
 
-#: g10/pkclist.c:763 g10/pkclist.c:799 g10/encode.c:791
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "you may not use %s while in %s mode\n"
 
-#: g10/pkclist.c:776 g10/pkclist.c:809 g10/pkclist.c:978 g10/pkclist.c:1038
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: skipped: %s\n"
 
-#: g10/pkclist.c:786 g10/pkclist.c:1010
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: skipped: public key already present\n"
 
-#: g10/pkclist.c:828
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "You did not specify a user ID. (you may use “-r”)\n"
 
-#: g10/pkclist.c:844
+#: g10/pkclist.c:845
 msgid "Current recipients:\n"
 msgstr "Current recipients:\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1513,33 +1512,33 @@ msgstr ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 
-#: g10/pkclist.c:886
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "No such user ID.\n"
 
-#: g10/pkclist.c:891 g10/pkclist.c:953
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr "skipped: public key already set as default recipient\n"
 
-#: g10/pkclist.c:909
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Public key is disabled.\n"
 
-#: g10/pkclist.c:916
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "skipped: public key already set\n"
 
-#: g10/pkclist.c:945
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "unknown default recipient ‘%s’\n"
 
-#: g10/pkclist.c:990
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: skipped: public key is disabled\n"
 
-#: g10/pkclist.c:1045
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
@@ -1565,71 +1564,71 @@ msgstr "too many compression preferences\n"
 msgid "invalid item `%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:773
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:819
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:881 g10/keygen.c:965 g10/keygen.c:1056
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:886 g10/keygen.c:970 g10/keygen.c:1061
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1161
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/keygen.c:1163
+#: g10/keygen.c:1167
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA and Elgamal (default)\n"
 
-#: g10/keygen.c:1164
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign only)\n"
 
-#: g10/keygen.c:1166
+#: g10/keygen.c:1170
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Elgamal (encrypt only)\n"
 
-#: g10/keygen.c:1167
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sign only)\n"
 
-#: g10/keygen.c:1169
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (encrypt only)\n"
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (sign and encrypt)\n"
 
-#: g10/keygen.c:1174 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/keygen.c:1208 g10/keyedit.c:800 g10/revoke.c:638
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1642,28 +1641,28 @@ msgstr ""
 "              default keysize is 1024 bits\n"
 "    highest suggested keysize is 2048 bits\n"
 
-#: g10/keygen.c:1230
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "What keysize do you want? (1024) "
 
-#: g10/keygen.c:1235
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA only allows keysizes from 512 to 1024\n"
 
-#: g10/keygen.c:1237
+#: g10/keygen.c:1241
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n"
 
-#: g10/keygen.c:1240
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize too small; 768 is smallest value allowed.\n"
 
-#: g10/keygen.c:1251
+#: g10/keygen.c:1255
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize too large; %d is largest value allowed.\n"
 
-#: g10/keygen.c:1256
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1671,11 +1670,11 @@ msgstr ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 
-#: g10/keygen.c:1259
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Are you sure that you want this keysize? "
 
-#: g10/keygen.c:1260
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1683,17 +1682,17 @@ msgstr ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 
-#: g10/keygen.c:1269
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:1272 g10/keygen.c:1276
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1709,7 +1708,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:1336
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1725,29 +1724,29 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:1360
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Signature is valid for? (0) "
 
-#: g10/keygen.c:1365
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:1370
+#: g10/keygen.c:1374
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s does not expire at all\n"
 
-#: g10/keygen.c:1377
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expires at %s\n"
 
-#: g10/keygen.c:1383
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1755,11 +1754,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:1388
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Is this correct (y/n)? "
 
-#: g10/keygen.c:1431
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1775,44 +1774,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1443
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:1451
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:1453
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:1455
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:1463
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:1474
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:1482
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:1488
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:1511
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:1517
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1823,27 +1822,27 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1526
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
-#: g10/keygen.c:1527
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1537
+#: g10/keygen.c:1541
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:1538
+#: g10/keygen.c:1542
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1557
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:1596
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1851,16 +1850,16 @@ msgstr ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 
-#: g10/keygen.c:1605 g10/keyedit.c:1005
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase not correctly repeated; try again"
 
-#: g10/keygen.c:1606
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1612
+#: g10/keygen.c:1616
 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"
@@ -1872,7 +1871,7 @@ msgstr ""
 "using this program with the option “--edit-key”.\n"
 "\n"
 
-#: g10/keygen.c:1634
+#: g10/keygen.c:1638
 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"
@@ -1884,58 +1883,58 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:2202 g10/revoke.c:215 g10/revoke.c:415
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
 msgid "sorry, can't do this in batch mode\n"
 msgstr "sorry, can't do this in batch mode\n"
 
-#: g10/keygen.c:2263
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA keypair will have 1024 bits.\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:2447 g10/keygen.c:2572
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:2449 g10/keygen.c:2575
+#: g10/keygen.c:2453 g10/keygen.c:2579
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "writing secret key stub to ‘%s’\n"
 
-#: g10/keygen.c:2452 g10/keygen.c:2578
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "writing secret key to ‘%s’\n"
 
-#: g10/keygen.c:2561
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "no writable secret keyring found: %s\n"
 
-#: g10/keygen.c:2585
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error writing public keyring ‘%s’: %s\n"
 
-#: g10/keygen.c:2592
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error writing secret keyring ‘%s’: %s\n"
 
-#: g10/keygen.c:2615
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:2626
+#: g10/keygen.c:2630
 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"
@@ -1943,30 +1942,30 @@ msgstr ""
 "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"
 
-#: g10/keygen.c:2638 g10/keygen.c:2751
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:2687 g10/sign.c:290
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:2689 g10/sign.c:292
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:2698
+#: g10/keygen.c:2702
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:2726
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Really create? "
 
@@ -2034,7 +2033,7 @@ msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s encrypted for: “%s”\n"
 
-#: g10/export.c:162 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:225
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "key ‘%s’ not found: %s\n"
@@ -2536,27 +2535,27 @@ msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID “%s” is revoked."
 
-#: g10/keyedit.c:500 g10/keyedit.c:520 g10/keyedit.c:541 g10/keyedit.c:692
-#: g10/keyedit.c:750 g10/keyedit.c:1354
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
-#: g10/keyedit.c:508 g10/keyedit.c:528 g10/keyedit.c:549 g10/keyedit.c:698
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:519
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID “%s” is expired."
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID “%s” is not self-signed."
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2565,11 +2564,11 @@ msgstr ""
 "The self-signature on “%s”\n"
 "is a PGP 2.x-style signature.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:607
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2578,12 +2577,12 @@ msgstr ""
 "Your current signature on “%s”\n"
 "has expired.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:611
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Do you want to issue a new signature to replace the expired one? (y/N) "
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2592,43 +2591,43 @@ msgstr ""
 "Your current signature on “%s”\n"
 "is a local signature.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Do you want to promote it to a full exportable signature? (y/N) "
 
-#: g10/keyedit.c:641
+#: g10/keyedit.c:657
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s” was already locally signed by key %s\n"
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:660
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s” was already signed by key %s\n"
 
-#: g10/keyedit.c:649
+#: g10/keyedit.c:665
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Do you want to sign it again anyway? (y/N) "
 
-#: g10/keyedit.c:671
+#: g10/keyedit.c:687
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nothing to sign with key %s\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "This key has expired!"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "This key is due to expire on %s.\n"
 
-#: g10/keyedit.c:710
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Do you want your signature to expire at the same time? (Y/n) "
 
-#: g10/keyedit.c:743
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2636,11 +2635,11 @@ msgstr ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 
-#: g10/keyedit.c:745
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "This would make the key unusable in PGP 2.x.\n"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2650,31 +2649,31 @@ msgstr ""
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter “0”.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) I will not answer.%s\n"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) I have not checked at all.%s\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) I have done casual checking.%s\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) I have done very careful checking.%s\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:803
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Your selection? (enter ‘?’ for more information): "
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2682,7 +2681,7 @@ msgstr ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2690,7 +2689,7 @@ msgstr ""
 "\n"
 "This will be a self-signature.\n"
 
-#: g10/keyedit.c:823
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2698,7 +2697,7 @@ msgstr ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2706,7 +2705,7 @@ msgstr ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2714,7 +2713,7 @@ msgstr ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 
-#: g10/keyedit.c:839
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2722,7 +2721,7 @@ msgstr ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 
-#: g10/keyedit.c:844
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2730,7 +2729,7 @@ msgstr ""
 "\n"
 "I have not checked this key at all.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2738,7 +2737,7 @@ msgstr ""
 "\n"
 "I have checked this key casually.\n"
 
-#: g10/keyedit.c:852
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2746,34 +2745,34 @@ msgstr ""
 "\n"
 "I have checked this key very carefully.\n"
 
-#: g10/keyedit.c:861
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Really sign? "
 
-#: g10/keyedit.c:906 g10/keyedit.c:3632 g10/keyedit.c:3723 g10/keyedit.c:3796
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
 
-#: g10/keyedit.c:962
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "This key is not protected.\n"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Secret parts of primary key are not available.\n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "Key is protected.\n"
 
-#: g10/keyedit.c:990
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Can't edit this key: %s\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2781,7 +2780,7 @@ msgstr ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2789,538 +2788,538 @@ msgstr ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Do you really want to do this? "
 
-#: g10/keyedit.c:1079
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "moving a key signature to the correct place\n"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:1124
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "save and quit"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "show fingerprint"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "list key and user IDs"
 
-#: g10/keyedit.c:1129
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "select user ID N"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "select secondary key N"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "list signatures"
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "sign the key"
 
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:1136
+#: g10/keyedit.c:1152
 msgid "tsign"
 msgstr "tsign"
 
-#: g10/keyedit.c:1136
+#: g10/keyedit.c:1152
 msgid "make a trust signature"
 msgstr "make a trust signature"
 
-#: g10/keyedit.c:1137
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:1137
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "sign the key locally"
 
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:1138
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "sign the key non-revocably"
 
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:1139
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "sign the key locally and non-revocably"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:1141
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "add a user ID"
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "add a photo ID"
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "delete user ID"
 
-#: g10/keyedit.c:1145
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1146
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "add a secondary key"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:1147
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "delete a secondary key"
 
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1164
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:1148
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
 msgstr "add a revocation key"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:1149
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "delete signatures"
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:1150
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "change the expire date"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "flag user ID as primary"
 
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:1152
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "toggle between secret and public key listing"
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:1155
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "list preferences (expert)"
 
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:1156
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "list preferences (verbose)"
 
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:1157
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "set preference list"
 
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:1158
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "updated preferences"
 
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1175
 msgid "keyserver"
 msgstr "keyserver"
 
-#: g10/keyedit.c:1159
+#: g10/keyedit.c:1175
 msgid "set preferred keyserver URL"
 msgstr "set preferred keyserver URL"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "change the passphrase"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "change the ownertrust"
 
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revoke signatures"
 
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1179
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:1163
+#: g10/keyedit.c:1179
 msgid "revoke a user ID"
 msgstr "revoke a user ID"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revoke a secondary key"
 
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:1165
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "disable a key"
 
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "enable a key"
 
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:1167
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "show photo ID"
 
-#: g10/keyedit.c:1186 g10/delkey.c:120
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "can't do that in batchmode\n"
 
-#: g10/keyedit.c:1217
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error reading secret keyblock ‘%s’: %s\n"
 
-#: g10/keyedit.c:1234
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1266
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Command> "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Need the secret key to do this.\n"
 
-#: g10/keyedit.c:1300
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Please use the command “toggle” first.\n"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Really sign all user IDs? "
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Select the user IDs to sign\n"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/keyedit.c:1415 g10/keyedit.c:1436 g10/keyedit.c:1495
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "You must select at least one user ID.\n"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "You can't delete the last user ID!\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Really remove all selected user IDs? "
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Really remove this user ID? "
 
-#: g10/keyedit.c:1459 g10/keyedit.c:1514
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "You must select at least one key.\n"
 
-#: g10/keyedit.c:1462
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Do you really want to delete the selected keys? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Do you really want to delete this key? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1514
 msgid "Really revoke all selected user IDs? "
 msgstr "Really revoke all selected user IDs? "
 
-#: g10/keyedit.c:1499
+#: g10/keyedit.c:1515
 msgid "Really revoke this user ID? "
 msgstr "Really revoke this user ID? "
 
-#: g10/keyedit.c:1518
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Do you really want to revoke the selected keys? "
 
-#: g10/keyedit.c:1519
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Do you really want to revoke this key? "
 
-#: g10/keyedit.c:1558
+#: g10/keyedit.c:1574
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Owner trust may not be set while using an user provided trust database\n"
 
-#: g10/keyedit.c:1590
+#: g10/keyedit.c:1606
 msgid "Set preference list to:\n"
 msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Really update the preferences for the selected user IDs? "
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Really update the preferences? "
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Save changes? "
 
-#: g10/keyedit.c:1649
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Quit without saving? "
 
-#: g10/keyedit.c:1659
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
 
-#: g10/keyedit.c:1666
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "update secret failed: %s\n"
 
-#: g10/keyedit.c:1673
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:1685
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help”)\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1760
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1812
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1823
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2047
+#: g10/keyedit.c:2063
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "This key may be revoked by %s key "
 
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2065 g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2084
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:2070
+#: g10/keyedit.c:2086
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:2072 g10/keyedit.c:2121 g10/keyedit.c:2224 g10/keyedit.c:2239
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:2087
+#: g10/keyedit.c:2103
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:2091
+#: g10/keyedit.c:2107
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:2098
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:2130
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey has been revoked: %s\n"
 
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- faked revocation found\n"
 
-#: g10/keyedit.c:2135
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem checking revocation: %s\n"
 
-#: g10/keyedit.c:2160 g10/keylist.c:696 g10/mainproc.c:1544 g10/trustdb.c:1124
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:2162 g10/keylist.c:698 g10/mainproc.c:1546 g10/trustdb.c:499
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:2183
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:2191
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3328,15 +3327,15 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:2256 g10/mainproc.c:923
+#: g10/keyedit.c:2272 g10/mainproc.c:930
 msgid "[revoked] "
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2258
+#: g10/keyedit.c:2274
 msgid "[expired] "
 msgstr "[expired] "
 
-#: g10/keyedit.c:2323
+#: g10/keyedit.c:2339
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3344,7 +3343,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2383
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3354,45 +3353,45 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:2388 g10/keyedit.c:2661
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:2543
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:2549
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:2563
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Deleted %d signature.\n"
 
-#: g10/keyedit.c:2564
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:2567
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:2656
+#: g10/keyedit.c:2672
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3402,88 +3401,88 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2683
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:2687
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:2710
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:2725
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:2747
+#: g10/keyedit.c:2763
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2782
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2788
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 
-#: g10/keyedit.c:2833
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Please remove selections from the secret keys.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Please select at most one secondary key.\n"
 
-#: g10/keyedit.c:2843
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changing expiration time for a secondary key.\n"
 
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:2892
+#: g10/keyedit.c:2908
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "No corresponding signature in secret ring\n"
 
-#: g10/keyedit.c:2988
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:3027 g10/keyedit.c:3137 g10/keyedit.c:3251
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "skipping v3 self-signature on user id “%s”\n"
 
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3215
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:3315
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:3361
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No secondary key with index %d\n"
 
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3496
 #, c-format
 msgid ""
 "\"\n"
@@ -3492,7 +3491,7 @@ msgstr ""
 "\"\n"
 "signed with your key %s at %s\n"
 
-#: g10/keyedit.c:3483
+#: g10/keyedit.c:3499
 #, c-format
 msgid ""
 "\"\n"
@@ -3501,65 +3500,65 @@ msgstr ""
 "\"\n"
 "locally signed with your key %s at %s\n"
 
-#: g10/keyedit.c:3488
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:3492
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:3521
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "You have signed these user IDs:\n"
 
-#: g10/keyedit.c:3542
+#: g10/keyedit.c:3558
 #, c-format
 msgid "   signed by %s on %s%s%s\n"
 msgstr "   signed by %s on %s%s%s\n"
 
-#: g10/keyedit.c:3551
+#: g10/keyedit.c:3567
 #, c-format
 msgid "   revoked by %s on %s\n"
 msgstr "   revoked by %s on %s\n"
 
-#: g10/keyedit.c:3571
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3597
 #, c-format
 msgid "   signed by %s on %s%s\n"
 msgstr "   signed by %s on %s%s\n"
 
-#: g10/keyedit.c:3583
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3590
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:3620
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:3690
+#: g10/keyedit.c:3706
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s” is already revoked\n"
 
-#: g10/keyedit.c:3707
+#: g10/keyedit.c:3723
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:3876
+#: g10/keyedit.c:3892
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
@@ -3600,39 +3599,39 @@ msgstr "not human readable"
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:629 g10/keylist.c:658 g10/keylist.c:756 g10/keylist.c:781
-#: g10/mainproc.c:925
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, c-format
+msgid " [expired: %s]"
+msgstr " [expired: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expires: %s]"
 
-#: g10/keylist.c:654 g10/keylist.c:752
+#: g10/keylist.c:646 g10/keylist.c:743
 #, c-format
 msgid " [revoked: %s]"
 msgstr " [revoked: %s]"
 
-#: g10/keylist.c:656 g10/keylist.c:754
-#, c-format
-msgid " [expired: %s]"
-msgstr " [expired: %s]"
-
-#: g10/keylist.c:1366
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:1368
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
 msgstr "     Subkey fingerprint:"
 
-#: g10/keylist.c:1375
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:1377
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:1381 g10/keylist.c:1385
+#: g10/keylist.c:1372 g10/keylist.c:1376
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
@@ -3661,174 +3660,183 @@ msgstr "%s encrypted data\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:309
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
+#: g10/mainproc.c:373
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:421
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:455
+#: g10/mainproc.c:462
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:465
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:493
+#: g10/mainproc.c:500
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:495
+#: g10/mainproc.c:502
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:523 g10/mainproc.c:545
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:531
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:563
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:567
+#: g10/mainproc.c:574
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:586
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: sender requested “for-your-eyes-only”\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:780
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import” to apply\n"
 
-#: g10/mainproc.c:1276
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1318 g10/mainproc.c:1328
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "can't handle these multiple signatures\n"
 
-#: g10/mainproc.c:1338
+#: g10/mainproc.c:1345
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1339
+#: g10/mainproc.c:1346
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:1343
+#: g10/mainproc.c:1350
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature made %s using %s key ID %s\n"
 
-#: g10/mainproc.c:1363
+#: g10/mainproc.c:1370
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:1463 g10/mainproc.c:1499
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "BAD signature from \""
 
-#: g10/mainproc.c:1464 g10/mainproc.c:1500
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Expired signature from \""
 
-#: g10/mainproc.c:1465 g10/mainproc.c:1501
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Good signature from \""
 
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1631
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                aka \""
+
+#: g10/mainproc.c:1638
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:1636
+#: g10/mainproc.c:1643
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:1639
+#: g10/mainproc.c:1646
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, digest algorithm %s\n"
 
-#: g10/mainproc.c:1640
+#: g10/mainproc.c:1647
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1648
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:1641 g10/trustdb.c:498
+#: g10/mainproc.c:1648 g10/trustdb.c:498
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:1661
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:1729 g10/mainproc.c:1745 g10/mainproc.c:1831
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:1772
+#: g10/mainproc.c:1779
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:1780
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:1837
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
 
-#: g10/mainproc.c:1847
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "invalid root packet detected in proc_tree()\n"
 
@@ -3986,15 +3994,15 @@ msgstr "cancelled by user\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem with the agent: agent returns 0x%lx\n"
 
-#: g10/passphrase.c:1044 g10/passphrase.c:1189
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
 msgid "can't query password in batchmode\n"
 msgstr "can't query password in batchmode\n"
 
-#: g10/passphrase.c:1049 g10/passphrase.c:1193
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
 msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
-#: g10/passphrase.c:1119
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -4004,51 +4012,51 @@ msgstr ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 
-#: g10/passphrase.c:1128
+#: g10/passphrase.c:1140
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s key, ID %s, created %s"
 
-#: g10/passphrase.c:1137
+#: g10/passphrase.c:1149
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subkey on main key ID %s)"
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1153
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (main key ID %s)"
 
-#: g10/passphrase.c:1197
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Repeat passphrase: "
 
-#: g10/plaintext.c:72
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data not saved; use option “--output” to save it\n"
 
-#: g10/plaintext.c:114 g10/plaintext.c:132
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creating ‘%s’: %s\n"
 
-#: g10/plaintext.c:420
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Detached signature.\n"
 
-#: g10/plaintext.c:424
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Please enter name of data file: "
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "reading stdin ...\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "no signed data\n"
 
-#: g10/plaintext.c:487
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "can't open signed data ‘%s’\n"
@@ -4094,20 +4102,25 @@ msgstr "secret key parts are not available\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protection algorithm %d%s is not supported\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:71
+#, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "protection digest %d is not supported\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Invalid passphrase; please try again"
 
-#: g10/seckey-cert.c:245
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:305
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "WARNING: Weak key detected - please change passphrase again.\n"
 
-#: g10/seckey-cert.c:343
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
 
diff --git a/po/eo.po b/po/eo.po
index 6f797ec2e..750738f1d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -13,47 +14,65 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
+#: util/secmem.c:90
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
+#, fuzzy
 msgid "yes"
 msgstr "jes"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "fini"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "fF"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "k"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "�enerala eraro"
@@ -250,7 +269,6 @@ msgstr "ne �ifrita"
 msgid "not processed"
 msgstr "ne traktita"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "neuzebla publika �losilo"
@@ -263,73 +281,81 @@ msgstr "neuzebla sekreta �losilo"
 msgid "keyserver error"
 msgstr "�losilservila eraro"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:407
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -354,7 +380,29 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+
+#: cipher/primegen.c:120
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr ""
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -362,163 +410,128 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[dosieroj]|�ifri dosierojn"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "nur skribi"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[dosieroj]|mal�ifri dosierojn"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "subskribi �losilon nerevokeble"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "subskribi �losilon loke kaj nerevokeble"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "listigi nur la sinsekvon de paketoj"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "eksporti la posedantofido-valorojn"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importi posedantofido-valorojn"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "senintervena aktualigo de fido-datenaro"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "ripari fu�itan fido-datenaron"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "elkirasigi dosieron a� la normalan enigon"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "enkirasigi dosieron a� la normalan enigon"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -528,195 +541,55 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "iom malpli da informoj"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "tute ne uzi la terminalon"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "devigi v3-subskribojn"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "ne devigi v3-subskribojn"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "devigi v4-subskribojn"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "ne devigi v4-�losilsubskribojn"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "�iam uzi sigelon (MDC) por �ifrado"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "neniam uzi MDC por �ifrado"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "uzi gpg-agent"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "neinteraga re�imo: neniam demandi"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "supozi \"jes\" �e la plej multaj demandoj"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "supozi \"ne\" �e la plej multaj demandoj"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "aldoni �i tiun sekretan �losilaron al la listo"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "montri, en kiu �losilaro estas listigita �losilo"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "legi la opciojn el dosiero"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[dosiero]|skribi statusinformojn al dosiero"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|KEYID|fidi �i tiun �losilon absolute"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "imiti la re�imon priskribitan en RFC 1991"
-
-#: g10/g10.c:442
-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:443
-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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|uzi pasfraz-re�imon N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOMO|uzi �ifrad-metodon NOMO"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOMO|uzi kompendi-metodon NOMO"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|uzi densig-metodon N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Montri Foto-Identigilojn"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "Ne montri Foto-Identigilojn"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "Agordi komandlinion por montri Foto-Identigilojn"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -724,7 +597,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -744,15 +617,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -762,7 +635,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -770,306 +643,476 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr ""
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr ""
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr ""
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+#, fuzzy
+msgid "Compression: "
+msgstr "Komento: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:983
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/g10.c:1172
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
+
+#: g10/g10.c:1181
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/g10.c:1193
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1196
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "%s: nova opcio-dosiero kreita\n"
+
+#: g10/g10.c:1601
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTO: %s ne estas por normala uzado!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "nevalida �losilaro"
+
+#: g10/g10.c:2134
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2137
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:1560
+#: g10/g10.c:2144
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:1563
+#: g10/g10.c:2147
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "nevalida kiraso"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "nevalida �losilaro"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTO: %s ne estas por normala uzado!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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:1737
+#: g10/g10.c:2441
 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:1743
+#: g10/g10.c:2447
 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:1756
+#: g10/g10.c:2460
 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:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "elektita �ifrad-metodo ne validas\n"
+
+#: g10/g10.c:2546
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1845
-#, 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:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-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:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 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:1862
-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:1868
+#: g10/g10.c:2583
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1876
+#: g10/g10.c:2592
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1880
+#: g10/g10.c:2596
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1884
+#: g10/g10.c:2600
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2633
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s ne havas sencon kun %s!\n"
+
+#: g10/g10.c:2680
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/g10.c:2685
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/g10.c:2690
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [dosiero]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [dosiero]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
+
+#: g10/g10.c:3096
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
+
+#: g10/g10.c:3098
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
+
+#: g10/g10.c:3109
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record malsukcesis: %s\n"
+
+#: g10/g10.c:3119
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:2691
+#: g10/g10.c:3659
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1078,110 +1121,149 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+#, fuzzy
+msgid "a user notation name must contain the '@' character\n"
+msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "iom malpli da informoj"
+
+#: g10/gpgv.c:68
+#, fuzzy
+msgid "take the keys from this keyring"
+msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
+
+#: g10/gpgv.c:70
+#, fuzzy
+msgid "make timestamp conflicts only a warning"
+msgstr "malkongruo de tempostampoj"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
+
+#: g10/gpgv.c:95
+#, fuzzy
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "�losilo estas anstata�igita."
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "�losilo estas kompromitita"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "�losilo estas ne plu uzata"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
@@ -1195,21 +1277,28 @@ msgstr "Kialo por revoko: "
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMfFsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenia fidovaloro atribuita al:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "            alinome \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "            alinome \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1221,109 +1310,112 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = Ne scias\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = Ni NE fidas �i tiun �losilon\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Mi fidas absolute\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = reen al la �efmenuo\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " f = fini\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Via decido? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "�u vi vere volas �an�i �i tiun �losilon al absoluta fido? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "�losilo %08lX: sub�losilo estas revokita!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: �losilo eksvalidi�is\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Ni NE fidas �i tiun �losilon\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Ne estas certe, ke �i tiu �losilo vere apartenas al la posedanto,\n"
-"sed �i tamen estas akceptita\n"
+"%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "�i tiu �losilo apartenas al ni\n"
 
-#: g10/pkclist.c:513
+#: g10/pkclist.c:500
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -1336,73 +1428,92 @@ msgstr ""
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan �losilon!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, fuzzy, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1410,131 +1521,127 @@ msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: 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:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "tro da '%c'-preferoj\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:218
 #, fuzzy
-msgid "invalid character in preference string\n"
+msgid "too many compression preferences\n"
+msgstr "tro da '%c'-preferoj\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:738
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (subskribi kaj �ifri)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (subskribi kaj �ifri)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1547,36 +1654,28 @@ msgstr ""
 "               implicita �losilgrando estas 1024 bitoj\n"
 " plej granda rekomendata �losilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1584,11 +1683,11 @@ msgstr ""
 "�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "�ar la komputado da�ras TRE longe!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1596,17 +1695,17 @@ msgstr ""
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1622,7 +1721,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1638,30 +1737,29 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1669,11 +1767,11 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1688,44 +1786,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1736,27 +1834,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1764,16 +1862,16 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1785,7 +1883,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1797,53 +1895,59 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#, fuzzy
+msgid "sorry, can't do this in batch mode\n"
+msgstr "ne povas fari tion en neinteraga re�imo\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "skribas sekretan �losilon al '%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "�losilo markita kiel absolute fidata.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1851,12 +1955,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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1864,7 +1968,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1872,531 +1976,599 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "�u vere krei? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ne povas malfermi: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "subskribado malsukcesis: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:558 g10/sign.c:758
+#: g10/encode.c:634 g10/sign.c:863
 #, 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:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-
-#: g10/encode.c:735
+#: g10/encode.c:818
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1614
 #, fuzzy, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:296
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s-subskribo de: %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no user ID\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:597
+#: g10/import.c:707
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
+msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:612
+#: g10/import.c:722
 #, fuzzy, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID '%s'\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:619
-#, c-format
-msgid "key %08lX: no valid user IDs\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 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:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:774
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:844
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
+
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1030
+#: g10/import.c:1299
 #, fuzzy, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1032
+#: g10/import.c:1301
 #, fuzzy, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
+msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
+msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
+msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
+msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr ""
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr ""
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, 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:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Mi fidas iomete\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Mi plene fidas\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 #, 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:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:380
+#: g10/keyedit.c:519
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgid "User ID \"%s\" is expired."
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:545
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:584
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2407,7 +2579,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:593
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2416,9 +2588,23 @@ msgstr ""
 "\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:422
+#: g10/keyedit.c:607
+#, fuzzy, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\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:611
+#, fuzzy
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
+
+#: g10/keyedit.c:632
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2429,7 +2615,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2438,48 +2624,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:657
 #, fuzzy, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:660
 #, fuzzy, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+#, fuzzy
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 #, 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:535
+#: g10/keyedit.c:759
 #, 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:537
+#: g10/keyedit.c:761
 #, 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:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2488,27 +2679,31 @@ 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:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr ""
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2516,14 +2711,14 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:835
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:839
 #, fuzzy
 msgid ""
 "\n"
@@ -2532,7 +2727,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:844
 #, fuzzy
 msgid ""
 "\n"
@@ -2541,7 +2736,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2549,7 +2744,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2557,7 +2752,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2565,7 +2760,7 @@ msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2573,7 +2768,7 @@ msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2581,33 +2776,34 @@ msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2615,7 +2811,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2623,468 +2819,573 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "�losilo"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "elekti flankan �losilon N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "subskribi la �losilon"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "subskribi"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "fari apartan subskribon"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsub"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "subskribi la �losilon nerevokeble"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsub"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "subskribi la �losilon loke kaj nerevokeble"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "alfoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "forfoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "addrevoker"
 msgstr "revokita"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "forvi�i subskribojn"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "�efa"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "monpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "agpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "aktpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "aktualigitaj preferoj"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "�losilservila eraro"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "ne povis analizi URI de �losilservilo\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revuid"
+msgstr "revsig"
+
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revoke a user ID"
+msgstr "aldoni uzantidentigilon"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "monfoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "montri foto-identigilon"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, 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:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+#, fuzzy
+msgid "Really revoke all selected user IDs? "
+msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
+
+#: g10/keyedit.c:1515
+#, fuzzy
+msgid "Really revoke this user ID? "
+msgstr "�u vere forigi �i tiun uzantidentigilon? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "agordi liston de preferoj"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr ""
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr ""
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
 #, 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:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (sentema)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "rev"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [eksvalidi�os: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [eksvalidi�os: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! sub�losilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "rev"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "eksval"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+#, fuzzy
+msgid "[revoked] "
+msgstr "rev"
+
+#: g10/keyedit.c:2274
+#, fuzzy
+msgid "[expired] "
+msgstr "eksval"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3093,242 +3394,300 @@ 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:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 #, 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:2012
+#: g10/keyedit.c:2410
 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:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2672
+#, fuzzy
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"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:2683
+#, fuzzy
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
+
+#: g10/keyedit.c:2703
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+
+#: g10/keyedit.c:2788
+#, fuzzy
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 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:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:2918
+#: g10/keyedit.c:3499
 #, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 #, 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:2931
+#: g10/keyedit.c:3512
 #, 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:2975
+#: g10/keyedit.c:3558
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, fuzzy, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keylist.c:91
+#: g10/keyedit.c:3892
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr ""
+
+#: g10/keylist.c:179
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/keylist.c:127
+#: g10/keylist.c:286
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "�losilaro"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [eksvalidi�os: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keylist.c:1001
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "rev"
+
+#: g10/keylist.c:1357
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1003
+#: g10/keylist.c:1359
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1010
+#: g10/keylist.c:1366
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1012
+#: g10/keylist.c:1368
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
 #: g10/mainproc.c:248
@@ -3336,237 +3695,331 @@ msgstr "     �losilo-fingrospuro ="
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:258
+#: g10/mainproc.c:262
 #, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "nevalida kompendi-metodo '%s'\n"
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "nekonata �ifrad-metodo"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s-�ifritaj datenoj\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "�ifrita per nekonata metodo %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "Ripetu pasfrazon\n"
+
+#: g10/mainproc.c:502
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "Ripetu pasfrazon\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+#, fuzzy
+msgid "WARNING: message was not integrity protected\n"
+msgstr "AVERTO: nenio estis eksportita\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Notacio: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Gvidlinio: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "            alinome \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+#, fuzzy
+msgid "Key available at: "
+msgstr "Nenia helpo disponata"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, fuzzy, c-format
+msgid "Signature expired %s\n"
+msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+
+#: g10/mainproc.c:1643
+#, fuzzy, c-format
+msgid "Signature expires %s\n"
+msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+
+#: g10/mainproc.c:1646
+#, fuzzy, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s-subskribo de: %s\n"
+
+#: g10/mainproc.c:1647
+#, fuzzy
+msgid "binary"
+msgstr "�efa"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr ""
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+#, fuzzy
+msgid "unknown"
+msgstr "nekonata versio"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 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:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
+#: g10/misc.c:491
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:513
+#: g10/misc.c:495
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
+#: g10/misc.c:508
+#, fuzzy
+msgid "Uncompressed"
+msgstr "ne traktita"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "ne traktita"
+
+#: g10/misc.c:643
+#, fuzzy, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "legas opciojn el '%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "nekonata implicita ricevonto '%s'\n"
+
 #: 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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "ne povas agordi kliento-PID por la agento\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "ne povas akiri lego-FD de servilo por la agento\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "ne povas akiri skribo-FD de servilo por la agento\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3577,32 +4030,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Donu pasfrazon\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Donu pasfrazon\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "nevalida respondo de agento\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Donu pasfrazon: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3612,258 +4073,260 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Donu pasfrazon: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, 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:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/pubkey-enc.c:249
+#: g10/pubkey-enc.c:292
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "ne povas akiri �losilon de �losilservilo: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "eraro dum sendo al '%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "ne povas ser�i �e �losilservilo: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "protekto-metodo %d%s ne estas realigita\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Nevalida pasfrazo; bonvolu provi denove"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta �losilo trovita - bonvolu �an�i la pasfrazon denove.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:215
-#, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
-"�i tio estas PGP-kreita ElGamal-�losilo, kiu NE estas sekura por "
-"subskribado!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:102
+#, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr ""
+
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
+msgid "public key %s is %lu second newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+
+#: g10/sign.c:112
 #, 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
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:159
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
+"kompletigo.\n"
+
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
+msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/sign.c:644
+#: g10/sign.c:741
 #, 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:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/sign.c:690
+#: g10/sign.c:794
 #, 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
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
@@ -3878,12 +4341,12 @@ msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
@@ -3892,195 +4355,264 @@ msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ne povas aliri: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: ne povas krei �loson\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: ne povas krei �loson\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ne povas krei: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa �losilidentigilo\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "�losilo markita kiel absolute fidata.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+msgid "never"
+msgstr ""
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "publika �losilo %08lX ne trovita: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "publika �losilo %08lX ne trovita: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr ""
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+#, fuzzy
+msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
+
+#: g10/trustdb.c:1948
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
-"kontrolas �e profundo %d subskribita=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4090,7 +4622,7 @@ msgstr ""
 "Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
@@ -4116,15 +4648,14 @@ msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
 "por subskribado!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4143,26 +4674,31 @@ msgstr "%s: nekonata sufikso\n"
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:326
+#: g10/openfile.c:349
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: dosierujo kreita\n"
@@ -4187,45 +4723,45 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4235,7 +4771,7 @@ msgstr ""
 "al alia persono. Ni bezonas �in por realigi la fido-reton; �i neniel\n"
 "rilatas al la (implicite kreita) atestilo-reto."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4247,85 +4783,53 @@ msgstr ""
 "aliron al la sekreta �losilo. Respondu \"jes\" por igi �i tiun �losilon\n"
 "absolute fidata\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr ""
 "Se vi tamen volas uzi �i tiun revokitan �losilon, respondu per \"jes\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se vi tamen volas uzi �i tiun nefidatan �losilon, respondu per \"jes\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Donu la uzantidentigilon de la adresito, al kiu vi volas sendi la mesa�on."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Elektu la uzotan metodon.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (alinome DSS) estas la subskrib-metodo uzebla nur por subskribado.\n"
-"�i tio estas la rekomendata metodo, �ar kontrolado �e DSA-subskriboj\n"
-"estas multe pli rapida ol �e ElGamal.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal estas metodo uzebla kaj por subskribado kaj por �ifrado.\n"
-"OpenPGP distingas inter du specoj de �i tiu metodo: nur�ifra, kaj\n"
-"subskriba-kaj-�ifra; efektive temas pri la sama, sed iuj parametroj\n"
-"devas esti elektitaj en speciala maniero por krei sekuran �losilon\n"
-"por subskribado: �i tiu programo faras tion, sed aliaj OpenPGP-\n"
-"programoj ne devas kompreni la subskriban-kaj-�ifran specon.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"La unua (�efa) �losilo devas esti �losilo uzebla por subskribado;\n"
-"tial la nur�ifra ElGamal-�losilo ne estas proponata en �i tiu menuo."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Kvankam �i tiuj �losiloj estas difinitaj en RFC 2440, ili ne estas\n"
-"rekomendataj, �ar ili ne estas komprenataj de �iuj programoj, kaj\n"
-"subskriboj kreitaj per ili etas iom grandaj kaj malrapide kontroleblaj."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Donu la �losilgrandon"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Respondu per \"jes\" a� \"ne\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4337,19 +4841,19 @@ msgstr ""
 "bonan eraromesa�on; anstata�e la sistemo provas interpreti\n"
 "la donitan valoron kiel gamon."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Donu la nomon de la �losilposedanto"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "bonvolu doni retadreson (ne devige, sed tre rekomendate)"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Bonvolu doni nedevigan komenton"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4363,11 +4867,11 @@ msgstr ""
 "B  por da�rigi kun la �losilkreado.\n"
 "F  por interrompi la �losilkreadon kaj fini."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4437,11 +4941,11 @@ msgstr ""
 "\n"
 "Se vi ne scias la �ustan respondon, respondu per \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4449,11 +4953,11 @@ msgstr ""
 "Respondu per \"jes\", se vi vere volas forvi�i la uzantidentigilon.\n"
 "Tiam anka� �iuj atestiloj perdi�os!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 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:214
+#: g10/helptext.c:203
 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"
@@ -4463,7 +4967,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4475,7 +4979,7 @@ msgstr ""
 "�losilo estis uzita, �ar la subskribanta �losilo eble establos\n"
 "fido-ligon tra alia jam atestita �losilo."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4483,7 +4987,7 @@ msgstr ""
 "La subskribo ne estas valida. Estas prudente forigi �in de\n"
 "via �losilaro."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4497,7 +5001,7 @@ msgstr ""
 "mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
 "havebla."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 #, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
@@ -4508,24 +5012,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:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 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:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4533,7 +5037,7 @@ msgstr ""
 "Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
 "dosiero (montrita en parentezo) estos uzata."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4561,7 +5065,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:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4571,68 +5075,621 @@ msgstr ""
 "�i tiun revokatestilon. Bonvolu fari �i tiun tekston konciza.\n"
 "Malplena linio finas la tekston.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Nenia helpo disponata"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu �losiloj jam kontrolitaj (%lu subskriboj)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr ""
+
+#: g10/photoid.c:87
+#, fuzzy, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "ne povas malfermi %s: %s\n"
+
+#: g10/photoid.c:97
+#, fuzzy
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+
+#: g10/photoid.c:112
+#, fuzzy, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "%s: ne estas fido-datenaro\n"
+
+#: g10/photoid.c:129
+#, fuzzy
+msgid "Is this photo correct (y/N/q)? "
+msgstr "�u tio estas �usta (j/n)? "
+
+#: g10/photoid.c:331
+#, fuzzy
+msgid "unable to display photo ID!\n"
+msgstr "ne povas malfermi %s: %s\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr ""
+
+#: g10/exec.c:184
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: ne povas krei dosierujon: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr ""
+
+#: g10/exec.c:513
+#, fuzzy, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "%s: eraro dum legado de versiregistro: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr ""
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr ""
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr ""
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+
+#: g10/exec.c:606
+#, fuzzy, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr ""
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, fuzzy, c-format
+msgid "build_packet failed: %s\n"
+msgstr "aktualigo malsukcesis: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "�losilo %08lX: mankas uzantidentigilo\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr ""
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr ""
+
+#: g10/revoke.c:279 g10/revoke.c:476
+#, fuzzy
+msgid "Create a revocation certificate for this key? "
+msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr ""
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, fuzzy, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "listigo de �losilblokoj malsukcesis: %s\n"
+
+#: g10/revoke.c:369
+#, fuzzy
+msgid "Revocation certificate created.\n"
+msgstr "�losilo %08lX: revokatestilo aldonita\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr ""
+
+#: g10/revoke.c:429
+#, fuzzy, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "�losilo '%s' ne trovita: %s\n"
+
+#: g10/revoke.c:458
+#, fuzzy, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "skribas publikan �losilon al '%s'\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr ""
+
+#: g10/revoke.c:492
+#, fuzzy
+msgid "unknown protection algorithm\n"
+msgstr "nekonata densig-metodo"
+
+#: g10/revoke.c:496
+#, fuzzy
+msgid "NOTE: This key is not protected!\n"
+msgstr "�i tiu �losilo ne estas protektita.\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+
+#: g10/revoke.c:588
+#, fuzzy
+msgid "Please select the reason for the revocation:\n"
+msgstr "Kialo por revoko: "
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr ""
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr ""
+
+#: g10/revoke.c:641
+#, fuzzy
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+"\n"
+"Donu la uzantidentigilon. Finu per malplena linio: "
+
+#: g10/revoke.c:669
+#, fuzzy, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Kialo por revoko: "
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr ""
+
+#: g10/revoke.c:676
+#, fuzzy
+msgid "Is this okay? "
+msgstr "�u tamen uzi �i tiun �losilon? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+
+#: g10/tdbdump.c:140
+#, fuzzy, c-format
+msgid "can't open file: %s\n"
+msgstr "ne povas malfermi %s: %s\n"
+
+#: g10/tdbdump.c:151
+#, fuzzy
+msgid "line too long\n"
+msgstr "pasfrazo estas tro longa\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr ""
+
+#: g10/tdbdump.c:164
+#, fuzzy
+msgid "error: invalid fingerprint\n"
+msgstr "%s: nevalida dosiero-versio %d\n"
+
+#: g10/tdbdump.c:168
+#, fuzzy
+msgid "error: no ownertrust value\n"
+msgstr "eksporti la posedantofido-valorojn"
+
+#: g10/tdbdump.c:204
+#, fuzzy, c-format
+msgid "error finding trust record: %s\n"
+msgstr "eraro dum legado de dosieruja registro: %s\n"
+
+#: g10/tdbdump.c:208
+#, fuzzy, c-format
+msgid "read error: %s\n"
+msgstr "kiraso: %s\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[dosieroj]|�ifri dosierojn"
+
+#~ msgid "store only"
+#~ msgstr "nur skribi"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[dosieroj]|mal�ifri dosierojn"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "subskribi �losilon nerevokeble"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "subskribi �losilon loke kaj nerevokeble"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "listigi nur la sinsekvon de paketoj"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "eksporti la posedantofido-valorojn"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "importi posedantofido-valorojn"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "senintervena aktualigo de fido-datenaro"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "ripari fu�itan fido-datenaron"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "elkirasigi dosieron a� la normalan enigon"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "enkirasigi dosieron a� la normalan enigon"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "tute ne uzi la terminalon"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "devigi v3-subskribojn"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "ne devigi v3-subskribojn"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "devigi v4-subskribojn"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "ne devigi v4-�losilsubskribojn"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "�iam uzi sigelon (MDC) por �ifrado"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "neniam uzi MDC por �ifrado"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "uzi gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "neinteraga re�imo: neniam demandi"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "supozi \"jes\" �e la plej multaj demandoj"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "supozi \"ne\" �e la plej multaj demandoj"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "aldoni �i tiun sekretan �losilaron al la listo"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "montri, en kiu �losilaro estas listigita �losilo"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
+
+#~ msgid "read options from file"
+#~ msgstr "legi la opciojn el dosiero"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[dosiero]|skribi statusinformojn al dosiero"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KEYID|fidi �i tiun �losilon absolute"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "imiti la re�imon priskribitan en RFC 1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|uzi pasfraz-re�imon N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NOMO|uzi �ifrad-metodon NOMO"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NOMO|uzi kompendi-metodon NOMO"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|uzi densig-metodon N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Montri Foto-Identigilojn"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Ne montri Foto-Identigilojn"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Agordi komandlinion por montri Foto-Identigilojn"
+
+#, fuzzy
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "la densig-metodo devas esti inter %d kaj %d\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "la densig-metodo devas esti inter %d kaj %d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Ne estas certe, ke �i tiu �losilo vere apartenas al la posedanto,\n"
+#~ "sed �i tamen estas akceptita\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "prefero %c%lu ne estas valida\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
+
+#, fuzzy
+#~ msgid " (default)"
+#~ msgstr "mal�ifri datenojn (implicita elekto)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidi�os: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Notacio: "
+
+#~ msgid "Policy: "
+#~ msgstr "Gvidlinio: "
+
+#, fuzzy
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "ne povas akiri �losilon de �losilservilo: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "eraro dum sendo al '%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ 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"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "ne povas ser�i �e �losilservilo: %s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "�i tio estas PGP-kreita ElGamal-�losilo, kiu NE estas sekura por "
+#~ "subskribado!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
+#~ "horlo�eraro)\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
+#~ "horlo�eraro)\n"
+
+#, fuzzy
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "�losilo markita kiel absolute fidata.\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "kontrolas �e profundo %d subskribita=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
+#~ "d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Elektu la uzotan metodon.\n"
+#~ "\n"
+#~ "DSA (alinome DSS) estas la subskrib-metodo uzebla nur por subskribado.\n"
+#~ "�i tio estas la rekomendata metodo, �ar kontrolado �e DSA-subskriboj\n"
+#~ "estas multe pli rapida ol �e ElGamal.\n"
+#~ "\n"
+#~ "ElGamal estas metodo uzebla kaj por subskribado kaj por �ifrado.\n"
+#~ "OpenPGP distingas inter du specoj de �i tiu metodo: nur�ifra, kaj\n"
+#~ "subskriba-kaj-�ifra; efektive temas pri la sama, sed iuj parametroj\n"
+#~ "devas esti elektitaj en speciala maniero por krei sekuran �losilon\n"
+#~ "por subskribado: �i tiu programo faras tion, sed aliaj OpenPGP-\n"
+#~ "programoj ne devas kompreni la subskriban-kaj-�ifran specon.\n"
+#~ "\n"
+#~ "La unua (�efa) �losilo devas esti �losilo uzebla por subskribado;\n"
+#~ "tial la nur�ifra ElGamal-�losilo ne estas proponata en �i tiu menuo."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Kvankam �i tiuj �losiloj estas difinitaj en RFC 2440, ili ne estas\n"
+#~ "rekomendataj, �ar ili ne estas komprenataj de �iuj programoj, kaj\n"
+#~ "subskriboj kreitaj per ili etas iom grandaj kaj malrapide kontroleblaj."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu �losiloj jam kontrolitaj (%lu subskriboj)\n"
+
+#, fuzzy
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "�losilo %08lX: mankas uzantidentigilo\n"
+
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "fini"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (subskribi kaj �ifri)\n"
+
+#, fuzzy
+#~ msgid "Create anyway? "
+#~ msgstr "�u tamen uzi �i tiun �losilon? "
+
+#, fuzzy
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "nevalida kompendi-metodo '%s'\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr "Uzado de �i tiu algoritmo estas malrekomendata - �u tamen krei? "
+
 #, fuzzy
 #~ msgid ""
 #~ "you have to start GnuPG again, so it can read the new configuration file\n"
@@ -4762,9 +5819,6 @@ msgstr "%s: �losilaro kreita\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "eraro dum legado de �efa �losilo por LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record malsukcesis: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "�losilo %08lX: peto-registro malsukcesis\n"
 
@@ -4777,9 +5831,6 @@ msgstr "%s: �losilaro kreita\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "�losilo %08lX: sekreta kaj publika �losiloj ne kongruas\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "�losilo %08lX.%lu: Bona sub�losila bindado\n"
 
@@ -4837,15 +5888,9 @@ msgstr "%s: �losilaro kreita\n"
 #~ msgid "lid %lu: inserted\n"
 #~ msgstr "lid %lu: en�ovita\n"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "eraro dum legado de dosieruja registro: %s\n"
-
 #~ msgid "\t%lu keys inserted\n"
 #~ msgstr "\t%lu �losiloj en�ovitaj\n"
 
-#~ msgid "enumerate keyblocks failed: %s\n"
-#~ msgstr "listigo de �losilblokoj malsukcesis: %s\n"
-
 #~ msgid "lid %lu: dir record w/o key - skipped\n"
 #~ msgstr "lid %lu: dosieruja registro sen �losilo - ignorita\n"
 
diff --git a/po/es.po b/po/es.po
index 3494296fe..e89d19ba3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,63 +1,80 @@
 # Mensajes en espa�ol para GnuPG.
-# Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
 # Urko Lusa <[email protected]>, 1998, 1999.
 #  I've tried to mantain the terminology used by Armando Ramos
 #  <[email protected]> in his PGP 2.3.6i translation.
 #  I also got inspiration from it.po by Marco d'Itri <[email protected]>
-# Jaime Su�rez <[email protected]>, 2001, 2002.
+# Jaime Su�rez <[email protected]>, 2001-2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-05-01 00:33+0200\n"
+"Project-Id-Version: GNU gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-18 22:40+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
 msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "por favor, vea http://www.gnupg.org/faq.html para m�s informaci�n\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operaci�n imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
-msgstr "s�"
+msgstr "s�|si"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
-msgstr "salir"
+msgstr "salir|fin|acabar"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "sS"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "Error general"
@@ -105,7 +122,7 @@ msgstr "Error en la suma de comprobaci�n"
 #
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "Contrase�a incorrecta"
+msgstr "Frase contrase�a incorrecta"
 
 #: util/errors.c:64
 msgid "public key not found"
@@ -179,7 +196,7 @@ msgstr "error al crear fichero"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "contrase�a incorrecta"
+msgstr "frase contrase�a incorrecta"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
@@ -277,7 +294,6 @@ msgstr "no cifrado"
 msgid "not processed"
 msgstr "no procesado"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "clave p�blica inutilizable"
@@ -290,29 +306,37 @@ msgstr "clave secreta inutilizable"
 msgid "keyserver error"
 msgstr "error del servidor de claves"
 
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
 # bicho :-)
 # �Error simplemente?
 # Uf, preferir�a bug, si leo "error" voy a pensar en otra cosa distinta...
-#: util/logger.c:249
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... esto es un bug (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "ha encontrado un error... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no se puede obtener informaci�n de `%s': %s\n"
@@ -322,50 +346,49 @@ msgstr "no se puede obtener informaci�n de `%s': %s\n"
 # Sugerencia a la sugerencia: �qu� tal omitido? (pasar en silencio una
 # cosa; excluirla de lo que se habla o escribe) dice el diccionario.
 # Bien. Tambi�n se puede poner "descartado".
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s` no es un fichero regular - omitido\n"
+msgstr "`%s` no es un fichero regular - descartado\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
-"atenci�n: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
+"ATENCI�N: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no se puede leer `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no se puede escribir `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no se puede cerrar `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -391,11 +414,36 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "el algoritmo de resumen `%s' es de s�lo lectura en esta versi�n\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Por favor espere, se est� reuniendo entrop�a. Haga alguna otra cosa con\n"
+"el ordenador mientras tanto si eso hace que no se aburra, porque eso\n"
+"mejorar� la calidad de la entrop�a.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "no se puede generar un primo con menos de %d bits\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "no se puede generar un primo con menos de %d bits\n"
+
 # �rdenes, please...
 # 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:307
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -403,163 +451,128 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[ficheros]|cifra ficheros"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "s�lo almacenar"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[ficheros]|descifra ficheros"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "firma la clave no revocablemente"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "firma la clave localmente y no revocablemente"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
-msgstr "actualiza claves desde un servidor de claves"
+msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "lista s�lo la secuencia de paquetes"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "exporta los valores de confianza"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importa los valores de confianza"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "actualiza la base de datos de confianza"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "arregla una base de datos de confianza da�ada"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "quita la armadura de un fichero o de la entrada est�ndar"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "crea la armadura a un fichero o a la entrada est�ndar"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -569,208 +582,59 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "usa la clave por defecto como destinatario"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "algo m�s discreto"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "no usa la terminal en absoluto"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "fuerza firmas v3"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "no fuerza firmas v3"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "fuerza firmas v4"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "no fuerza firmas v4"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "siempre usa un MDC para cifrar"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "nunca usa un MDC para cifrar"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-# usa
-# Vale.
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "usa el agente gpg"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "proceso por lotes: nunca preguntar"
-
-# assume -> suponer, no asumir
-# No estoy seguro. El diccionario Collins en la acepci�n b) de asumir
-# dice "b) (suponer) to assume, suppose..."
-# 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:410
-msgid "assume yes on most questions"
-msgstr "asume \"s�\" en casi todas las preguntas"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "asume \"no\" en casi todas las preguntas"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "a�ade este anillo a la lista de anillos"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "a�ade este anillo secreto a la lista"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "muestra en qu� anillos est� una clave"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|SERVIDOR|usa este servidor de claves"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "lee opciones del fichero"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[fichero]|escribe informaci�n de estado en el fichero"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
+msgstr "preguntar antes de sobreescribir"
 
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emula el modo descrito en la RFC1991"
-
-#: g10/g10.c:442
-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:443
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-msgstr "todas las opciones de paquete, cifrado y resumen tipo PGP 2.x"
-
-#: g10/g10.c:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|usa modo de contrase�a N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE para las contrase�as"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|usa el algoritmo de compresi�n N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Muestra IDs fotogr�ficos"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "No muestra IDs fotogr�ficos"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "Ajusta linea de comandos para ver IDs fotogr�ficos"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
 
 # 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:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -778,7 +642,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -798,15 +662,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -814,9 +678,9 @@ msgid ""
 msgstr ""
 "Sintaxis: gpg [opciones] [ficheros]\n"
 "firma, comprueba, cifra o descifra\n"
-"la operaci�n por defecto depende del tipo de datos de entrada.\n"
+"la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -824,292 +688,452 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Clave p�blica: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Cifrado: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Resumen: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Compresi�n: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "no se encontr� el signo = en la definici�n de grupo \"%s\"\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1166
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1196
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "Aviso: permisos inseguros de %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1202
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1205
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "Aviso: permisos inseguros de %s \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1208
 #, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "art�culo de configuraci�n desconocido \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
+msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTA: �%s no es para uso normal!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
-msgstr ""
+msgstr "no se carga el cifrado de ampliaci�n \"%s\" por permisos inseguros\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, 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:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: versi�n del fichero %d inv�lida\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "opciones de exportaci�n inv�lidas\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "armadura inv�lida"
+msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: versi�n del fichero %d inv�lida\n"
+msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "anillo inv�lido"
+msgstr "opciones de exportaci�n inv�lidas\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "opciones de importaci�n inv�lidas\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTA: �%s no es para uso normal!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "este mensaje podr�a no ser utilizable por PGP 2.x\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:1845
-#, 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:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
+
+#: g10/g10.c:2572
 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:1858
+#: g10/g10.c:2576
 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:1862
-msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "nivel de comprobaci�n por defecto inv�lido; debe ser 0, 1, 2, � 3\n"
-
-#: g10/g10.c:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "preferencias inv�lidas\n"
+msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "preferencias inv�lidas\n"
+msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "preferencias inv�lidas\n"
+msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "preferencias inv�lidas\n"
+msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s a�n no funciona con %s\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "no puede usar el cifrado \"%s\" en modo %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "no puede usar el resumen \"%s\" en modo %s\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "no puede usar la compresi�n \"%s\" en modo %s\n"
+
+#: g10/g10.c:2778
 #, 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:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
+msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [nombre_fichero]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "no puede usar %s en modo %s\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [nombre_fichero]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "no puede usar %s en modo %s\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-usuario"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-usuario"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "env�o al servidor de claves fallido: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "recepci�n del servidor de claves fallida: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "exportaci�n de clave fallida: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "b�squeda del servidor de claves fallida: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "renovaci�n al servidor de claves fallida: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1117,157 +1141,202 @@ 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:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
+"acabar con un '='\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3678
 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:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "URL de pol�tica inv�lida\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "algo m�s discreto"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "tomar las claves de este anillo"
+
+# o tal vez "en el sello..."
+# Creo que es mejor "con el sello de fecha", no es un conflicto
+# del sello en si mismo sino en relaci�n con el mensaje.
+# Ok.
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sintaxis: gpg [opciones] [ficheros]\n"
+"Confrontar las firmas contra claves conocidas\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "cabecera de armadura inv�lida: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara inv�lida\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "armadura inesperada"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracteres inv�lidos radix64 %02x omitidos\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada."
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "La clave ya no est� en uso"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "Raz�n para la revocaci�n: "
+msgstr "raz�n para la revocaci�n: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Comentario a la revocaci�n: "
+msgstr "comentario a la revocaci�n: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "No hay confianza definida para:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1279,189 +1348,210 @@ msgstr ""
 "comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = No lo s�\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%d = No conf�o\n"
+msgstr " %d = No conf�o\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Conf�o poco\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = conf�o por completo\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = por favor mu�streme m�s informaci�n\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = volver al men� principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = saltar esta clave\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = salir\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Su decisi�n: "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "�De verdad quiere asignar total confianza a esta clave? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clave %08lX: �esta clave ha sido revocada!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "�Usar esta clave de todas formas? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "clave %08lX: �esta subclave ha sido revocada!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: clave caducada\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: No hay indicios de que la firma pertenezca realmente al propietario.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: No hay seguridad que esta clave pertenezca realmente a su \n"
-"proprietario pero se acepta igualmente\n"
+"%08lX: No hay indicios de que la firma pertenezca realmente al propietario.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Esta clave probablemente pertenece a su proprietario\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"No es seguro que la clave pertenezca a su propietario.\n"
-"Si *realmente* sabe lo que est� haciendo, puede contestar\n"
-"\"s�\" a la siguiente pregunta.\n"
+"No es seguro que la clave pertenezca a la persona que se nombra en el.\n"
+"identificador de usuario. Si *realmente* sabe lo que est� haciendo, \n"
+"puede contestar s� a la siguiente pregunta.\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "AVISO: la clave puede estar revocada (falta clave de revocaci�n)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr ""
+"ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
+"como revocador!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta clave est� deshabilitada.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave ha caducado!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"ATENCI�N: �Esta clave no est� certificada con firmas de "
-"suficienteconfianza!\n"
+"ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
+"confianza!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "no puede usar %s en modo %s\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1469,130 +1559,126 @@ msgstr ""
 "\n"
 "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 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:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr "la preferencia %c%lu no es v�lida\n"
-
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "demasiadas `%c' preferencias\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "caracter inv�lido en cadena de preferencias\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "demasiadas `%c' preferencias\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "demasiadas `%c' preferencias\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "caracter inv�lido en cadena de preferencias\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "escribiendo autofirma\n"
+msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (firmar y cifrar)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (firmar y cifrar)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1605,36 +1691,28 @@ msgstr ""
 "        el tama�o por defecto es 1024 bits\n"
 " el tama�o m�ximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "�De qu� tama�o quiere la clave (1024)? "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 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:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1642,11 +1720,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:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1654,17 +1732,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1680,7 +1758,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1696,30 +1774,29 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s nunca caduca\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1727,11 +1804,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1747,44 +1824,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1795,46 +1872,46 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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 real o en el "
 "comentario\n"
 
-#: g10/keygen.c:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"Necesita una contrase�a para proteger su clave secreta.\n"
+"Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
-msgstr "contrase�a repetida incorrectamente; int�ntelo de nuevo"
+msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1846,7 +1923,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1859,53 +1936,58 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "escribiendo clave privada en `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "clave marcada como de confianza absoluta.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1913,12 +1995,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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1926,7 +2008,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:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1934,553 +2016,636 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no se puede abrir: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "error creando contrase�a: %s\n"
+msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "usando cifrado %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCI�N: fichero vac�o\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
 
-#: g10/encode.c:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
+"del destinatario\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, 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:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Esta orden no se permite en modo %s.\n"
+msgstr ""
+"forzar el algoritmo de compresi�n %s (%d) va en contra de las preferencias "
+"del receptor\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s cifrado para: %s\n"
+msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "clave %08lX: no es conforme a rfc2440 - omitida\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "clave %08lX: no protegida - omitida\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+"AVISO: la clave secreta %08lX no tiene suma de comprobaci�n simple SK\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %08lX inv�lida hecha mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "no hay subclave secreta para la clave p�blica %08lX -ignorada\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "              importadas: %lu"
+msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "clave %08lX: sin identificador de usuario\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/import.c:597
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "clave %08lX: no hay subclave que unir\n"
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "firma %s de: \"%s\"\n"
 
-#: g10/import.c:612
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "clave %08lX: sin identificador de usuario\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "clave %08lX: reparada la subclave HKP corrompida\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "clave %08lX: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 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:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "clave %08lX: clave nueva - omitida\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "clave %08lX: clave p�blica importada\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "clave %08lX: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "clave %08lX: no coincide con nuestra copia\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "clave %08lX: 1 nuevo identificador de usuario\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "clave %08lX: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "clave %08lX: %d nuevos identificadores de usuario\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "clave %08lX: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "clave %08lX: 1 nueva firma\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "clave %08lX: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "clave %08lX: %d nuevas firmas\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "clave %08lX: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "clave %08lX: 1 nueva subclave\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "clave %08lX: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "clave %08lX: %d nuevas subclaves\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "clave %08lX: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:774
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "clave %08lX: \"%s\" sin cambios\n"
+
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "clave %08lX: sin cambios\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "clave %08lX: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "clave %08lX: certificado de revocaci�n importado\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "clave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "clave %08lX: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "clave %08lX: algoritmo de clave p�blica no disponible para el id \"%s\"\n"
 
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr "clave %08lX: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave que unir\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "clave %08lX: uni�n de subclave inv�lida\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "clave %08lX: uni�n de subclave inv�lida\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "clave %08lX: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "clave %08lX: no hay subclave que unir\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "clave %08lX: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "clave %08lX.%lu: revocaci�n de subclave v�lida\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "clave %08lX: revocaci�n de subclave inv�lida\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "clave %08lX: uni�n de subclave inv�lida\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "clave %08lX: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "clave %08lX: omitido ID de usuario '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "clave %08lX: subclave omitida\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "clave %08lX: certificado de revocaci�n en lugar equivocado - omitido\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "clave %08lX: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "clave %08lX: firma de clase (0x%02x) inesperada - omitida\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1698
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"Aviso: la clave %08lX puede estar revocada: recuperando clave de revocaci�n %"
+"AVISO: la clave %08lX puede estar revocada: recuperando clave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1403
+#: g10/import.c:1711
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"Aviso: la clave %08lX puede estar revocada: clave e revocaci�n %08lXno est� "
-"presente.\n"
+"AVISO: la clave %08lX puede estar revocada: falta clave de revocaci�n %"
+"08lX.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "clave %08lX: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "clave %08lX: firma directa de clave a�adida\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "%d firmas no comprobadas por causa de un error\n"
+msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, 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:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Conf�o poco\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Conf�o totalmente\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "ATENCI�N `%s' es un fichero vac�o\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "ID de usuario \"%s\" no tiene autofirma."
+
+#: g10/keyedit.c:584
+#, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"Su firma actual en \"%s\"\n"
-"es una firma local.\n"
+"La autofirma en \"%s\"\n"
+"es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
+msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Su firma actual en \"%s\"\n"
+"ha expirado.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
+
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2489,39 +2654,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %08lX\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "�Quiere firmarlo a�n as�? (s/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2529,11 +2698,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2543,27 +2712,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2571,32 +2744,31 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "esto puede ser debido a la ausencia de autofirma\n"
+msgstr ""
+"\n"
+"Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"La firma se marcar� como no exportable.\n"
+"ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"La firma se marcar� como no revocable.\n"
+"AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2604,7 +2776,7 @@ msgstr ""
 "\n"
 "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2612,7 +2784,7 @@ msgstr ""
 "\n"
 "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2620,7 +2792,7 @@ msgstr ""
 "\n"
 "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2628,7 +2800,7 @@ msgstr ""
 "\n"
 "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2636,505 +2808,588 @@ msgstr ""
 "\n"
 "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 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:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Introduzca la nueva contrase�a para esta clave secreta.\n"
+"Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
+"No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "graba"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "ayuda"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "hdac"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "idu"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "clave"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "comprueba"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "firma"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "firma"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "crea una firma separada"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "firmal"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "firmanr"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "firma la clave irrevocablemente"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "firmanrl"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "firma la clave local e irrevocablemente"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "a�aidu"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "a�ade un identificador de usuario"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "a�adirfoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "a�ade un ID fotogr�fico"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "borridu"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "borra un identificador de usuario"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "borfoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "a�acla"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "borrcla"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "a�acla"
+msgstr "a�arevoc"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "a�ade una clave secundaria"
+msgstr "a�ade una clave de revocaci�n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "borrfir"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primaria"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "marca ID de usuario como primario"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "cambia"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "muestra preferencias (experto)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "verpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "muestra preferencias (prolijo)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "estpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "establece preferencias"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "actpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "error del servidor de claves"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "no se puede interpretar la URI del servidor de claves\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "contr"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
-msgstr "cambia la contrase�a"
+msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "conf"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revfir"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revidu"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "revocar un identificador de usuario"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revcla"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "descla"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "habcla"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "verfoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "mostrar ID fotogr�fico"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error leyendo bloque de clave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "�Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "Sugerencia: seleccione los identificadores de usuario para firmar\n"
+msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "�Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "�Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "�De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "�De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "�Revocar realmente todos los identificadores seleccionados? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "�Revocar realmente este identificador de usuario? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "�De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "establece preferencias"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "�Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "�Actualizar realmente las preferencias? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Resumen: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Caracter�sticas: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
 msgid "This key may be revoked by %s key "
-msgstr "Esta clave puede ser revocada por %s clave %s%s\n"
+msgstr "Esta clave puede ser revocada por la clave %s"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (confidencial)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "no se puede crear %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revocada]"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [caduca: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [caduca: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �esta subclave ha sido revocada! %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev-  se encontr� una revocaci�n falsificada\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema comprobando la revocaci�n: %s\n"
 
-#: g10/keyedit.c:1837
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revocada]"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 #, fuzzy
+msgid "expired"
+msgstr "expira"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
+
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3142,7 +3397,23 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revocada]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[caducada]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
+"       causar que se tome como principal por defecto otro ID de usuario.\n"
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3151,775 +3422,932 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
+"       hacer que algunas versiones de PGP rechacen esta clave.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Introduzca la longitud de la clave"
+msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "no puede elegir una clave como su propio revocador designado\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr ""
+"ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
+"como revocador!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
+"�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"�Est� seguro de querer elegir esta clave como revocador designado? (s/N): "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
-msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
+msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "clave %08lX: autofirma inv�lida para el id \"%s\"\n"
+msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, 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:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "firmada localmente con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   firmada por %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   firmada por %08lX el %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Mostrando ID fotogr�fico %s de tama�o %ld para la clave 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Pol�tica de firmas: "
+msgstr "Pol�tica de firmas cr�ticas: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Pol�tica de firmas: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Notaci�n de firma: "
+msgstr "Notaci�n de firmas cr�ticas: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [caduca: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revocada]"
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "lista claves y huellas dactilares"
+msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "    Huella de clave ="
+msgstr "     Huella de subclave:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "    Huella de clave ="
+msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "    Huella de clave ="
+msgstr "      Huella de subclave:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "    Huella de clave ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "frase de paso mala o algoritmo de cifrado desconocido (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "cifrado con algoritmo desconocido %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "la clave p�blica es %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "datos cifrados de la clave p�blica: DEK correcta\n"
+msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "cifrado con %lu frases contrase�a\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "cifrado con 1 frase contrase�a\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
-"cifrado IDEA indisponible, optimistamente intentando usar %s en su lugar\n"
+"cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Notaci�n: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Pol�tica: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 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:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1310
-#, 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:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                alias \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Firmado el %.*s usando clave %s ID %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Clave disponible en: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Firma caducada de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Firma caducada en %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "La firma caduca el %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "firma %s de: \"%s\"\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binaria"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "modotexto"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "desconocido"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "�No se deber�an usar algoritmos experimentales!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "ese algoritmo de cifrado est� desacreditado;�por favor use uno m�s "
 "est�ndar!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "por favor vea http://www.gnupg.org/why-not-idea.html para m�s informaci�n\n"
 
-#: g10/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "ATENCI�N: %s es una opci�n desaconsejada.\n"
+msgstr "%s:%d: opci�n desaconsejada \"%s\"\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ATENCI�N: %s es una opci�n desaconsejada.\n"
+msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada.\n"
 
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "por favor use \"--keyserver-options %s\" en su lugar\n"
+msgstr "por favor use \"%s%s\" en su lugar\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Sin comprimir"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Sin comprimir"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "este mensaje podr�a no ser utilizable por %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "leyendo opciones desde `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "desconocido el destinatario predefinido `%s'\n"
 
 #: 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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
+
+#: g10/parse-packet.c:1128
 #, 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"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "no puedo establecer pid para el agente\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "no puedo conseguir el FD de lectura para el agente\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "no puedo conseguir el FD de escritura para el agente\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
-"Necesita una contrase�a para desbloquear la clave secreta\n"
+"Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %08lX, creada el %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Introduzca contrase�a\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
-msgstr "Repita contrase�a\n"
+msgstr "Repita frase contrase�a\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
-msgstr "contrase�a demasiado larga\n"
+msgstr "frase contrase�a demasiado larga\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "respuesta del agente inv�lida\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Introduzca frase contrase�a: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 "\n"
-"Necesita una contrase�a para desbloquear la clave secreta\n"
+"Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Introduzca contrase�a: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr "(ID clave primaria %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
-msgstr "Repita contrase�a: "
+msgstr "Repita frase contrase�a: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 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:178
+#: g10/pubkey-enc.c:228
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: clave secreta %08lX caducada el %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "clave %08lX: �esta clave ha sido revocada!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "solicitando clave %08lX del servidor de claves HKP %s\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "no puede obtenerse la clave en el servidor: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "error enviando a `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "envi� correcto a `%s` (estado=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "fall� el envio a `%s': status=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "buscando \"%s\" en el servidor HKP %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "no puede buscarse en el servidor: %s\n"
+msgstr "NOTA: la clave ha sido revocada"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "las partes de la clave privada no est�n disponibles\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "el algoritmo de protecci�n %d%s no puede ser utilizado\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
-msgstr "Contrase�a incorrecta; int�ntelo de nuevo."
+msgstr "Frase contrase�a incorrecta; int�ntelo de nuevo."
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ... \n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "ATENCI�N: detectada clave d�bil - por favor cambie la contrase�a.\n"
+msgstr ""
+"ATENCI�N: detectada clave d�bil - por favor cambie la frase contrase�a.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "generando la suma de comprobaci�n de 16 bits (desaconsejada) para \n"
 "proteger la clave secreta.\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
-msgstr ""
+msgstr "AVISO: conflicto con el resumen de la firma del mensaje\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:99
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "AVISO: la subclave de firmado %08lX no tiene certificado cruzado\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"�esto es una clave ElGamal generada por PGP que NO es segura para las "
-"firmas!\n"
+"AVISO: la subclave de cifrado %08lX tiene un certificado cruzado inv�lido\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "la clave p�blica %08lX es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "la clave p�blica %08lX es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: clave de la firma %08lX caducada el %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"asumiendo firma incorrecta de la clave %08lX por un bit cr�tico desconocido\n"
+
+#: g10/sig-check.c:532
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "asumiendo firma incorrecta debido a un bit cr�tico desconocido\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr ""
+"clave %08lX: no hay subclave para el paquete de revocaci�n de subclave\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:558
 #, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "clave %08lX: no hay subclave para firma de subclave de enlace\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
+
+#: g10/sign.c:112
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:151
-#, c-format
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "no puede poner URL de pol�tica en firmas v3 (estilo PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"no puede poner URL de pol�tica en firmas de claves v3 (estilo PGP 2.x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "firma %s de: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "firma %s de: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "s�lo puede firmar con claves tipo PGP 2.x estando en modo --pgp2\n"
+msgstr ""
+"s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
+"pgp2\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
+msgstr ""
+"forzar el algoritmo de resumen %s (%d) va en contra de las\n"
+"preferencias del destinatario\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
@@ -3934,212 +4362,281 @@ msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
-"resgistro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
+"registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
 #: g10/tdbio.c:244
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: no se puede abrir: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: no se puede crear bloqueo\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: no se puede crear bloqueo\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no se puede crear: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inv�lida\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave v�lido\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "clave %08lX: aceptada como clave de confianza\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "clave %08lX aparece m�s de una vez en la base de datos de confianza\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "clave %08lX: clave fiable sin clave p�blica - omitida\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "clave marcada como de confianza absoluta.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "nunca     "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "clave p�blica %08lX no encontrada: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "por favor haga un --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "clave p�blica %08lX no encontrada: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "no se encuentran claves totalmente fiables\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave totalmente fiable %08lX no encontrada\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
-"comprobando en profundidad %d firmado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4149,7 +4646,7 @@ msgstr ""
 "Por favor recuerde que el fichero de firma (.sig o .asc)\n"
 "deber�a ser el primero que se da en la l�nea de �rdenes.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 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"
@@ -4173,15 +4670,14 @@ msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "`%s' omitida: esta es una clave ElGamal generada por PGP que NO es segura "
 "para las firmas\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4200,26 +4696,31 @@ msgstr "%s: sufijo desconocido\n"
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: se ha creado un nuevo fichero de opciones\n"
+msgstr "creado un nuevo fichero de configuraci�n `%s'\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no se puede crear el directorio: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directorio creado\n"
@@ -4245,45 +4746,45 @@ msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA necesita un algoritmo de hash de 160 bits.\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(excepto si especifica la clave dando su huella digital)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "�Eliminar esta clave del anillo? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "�Esta es una clave secreta! �Eliminar realmente? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "borrada informaci�n de propietarios\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4293,7 +4794,7 @@ msgstr ""
 "terceros. Es necesario para implementar la red de confianza, no tiene nada\n"
 "que ver con la red de certificados (impl�citamente creada)."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4302,85 +4803,56 @@ msgid ""
 msgstr ""
 "Para construir la Red-de-Confianza, GnuPG necesita saber qu� claves\n"
 "tienen confianza total - normalmente son las claves para las que usted\n"
-"puede acceder a la clave secreta. Conteste \"yes\" para hacer que esta\n"
+"puede acceder a la clave secreta. Conteste \"s�\" para hacer que esta\n"
 "clave se considere como de total confianza\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Si quiere usar esta clave revocada de todos modos, conteste \"s�\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si quiere usar esta clave no fiable de todos modos, conteste \"s�\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduzca el ID de usuario al que quiere enviar el mensaje."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Seleccione el algoritmo que usar�.\n"
-"\n"
-"DSA (tambi�n conocido como DSS) es un algoritmo de firma digital que s�lo\n"
-"puede usarse para firmas. Es el algoritmo sugerido porque la verificaci�n\n"
-"de firmas DSA es mucho m�s r�pida que la de firmas ElGamal.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"ElGamal es un algoritmo que puede ser usado para firma y cifrado. OpenPGP\n"
-"distingue entre dos tipos de estos algoritmos: s�lo para cifrado y para\n"
-"firma y cifrado. En realidad es lo mismo, pero se deben seleccionar ciertos\n"
-"par�metros de una forma particular para crear una clave segura para firmas.\n"
-"Este programa lo hace as�, pero otras implementaciones de OpenPGP no tienen\n"
-"por qu� entender el tipo de firma y cifrado.\n"
-"\n"
-"La clave primaria debe ser una clave capaz de firmar, es por ello que la\n"
-"opci�n de clave ElGamal s�lo para cifrado no est� disponible en este men�."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Aunque estas claves est�n definidas en RFC2440, no se aconseja su uso,\n"
-"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:98
+#: g10/helptext.c:87
 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 ""
+"En general no es una buena idea usar la misma clave para firmar y\n"
+"cifrar. Este algoritmo deb�ria usarse solo en ciertos contextos.\n"
+"Por favor consulte primero a un experto en seguridad."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Introduzca la longitud de la clave"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"s�\" o \"no\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4392,21 +4864,21 @@ msgstr ""
 "buena respuesta a los errores; el sistema intentar� interpretar el valor\n"
 "introducido como un intervalo."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Introduzca el nombre del due�o de la clave"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 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:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Introduzca un comentario opcional"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4420,11 +4892,11 @@ msgstr ""
 "O  para continuar con la generaci�n de clave.\n"
 "S  para interrumpir la generaci�n de clave."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4499,11 +4971,11 @@ msgstr ""
 "\n"
 "Si no sabe qu� contestar, conteste \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4511,11 +4983,11 @@ msgstr ""
 "Responda \"s�\" si realmente quiere borrar este ID de usuario.\n"
 "�Tambi�n se perder�n todos los certificados!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"s�\" si quiere borrar esta subclave"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4525,7 +4997,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4537,13 +5009,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:225
+#: g10/helptext.c:214
 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:229
+#: g10/helptext.c:218
 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"
@@ -4556,7 +5028,7 @@ 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:237
+#: g10/helptext.c:226
 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"
@@ -4566,25 +5038,25 @@ msgstr ""
 "seleccionados) a la lista actual de preferencias. El sello de tiempo\n"
 "de todas las autofirmas afectadas se avanzar� en un segundo.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor introduzca la contrase�a: una frase secreta \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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�."
+msgstr "Repita la �ltima frase contrase�a para asegurarse de lo que tecle�."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 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:259
+#: g10/helptext.c:248
 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:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4592,7 +5064,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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4621,7 +5093,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:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4631,75 +5103,668 @@ 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:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "comprobando anillo `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "hasta ahora procesadas %lu claves (%lu firmas)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu claves comprobadas (%lu firmas)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu claves comprobadas (%lu firmas)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Escoja una imagen para usar en su ID fotogr�fico. La imagen debe ser un\n"
+"fichero JPEG. Recuerde que la im�gen se almacena en su clave p�blica.\n"
+"Si usa una foto muy grande, �su clave ser� tambi�n muy grande!\n"
+"Una imagen cercana a 240x288 tiene un tama�o adecuado.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Introduzca nombre del fichero JPEG para ID fotogr�fico: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Imposible abrir fotograf�a \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "�Seguro que quiere usarlo? (s/N) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" no es un fichero JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "�Es correcta la foto? (s/n) "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "�no puedo mostrar ID fotogr�fico!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "no es posible ejecutar programas remotos\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "no se puede crear el directorio `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"llamadas a programas externos inhabilitadas por permisos inseguros de "
+"ficheros.\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"esta plataforma necesita ficheros temporales para llamar a programas "
+"externos.\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "no se puede ejecutar %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "error del sistema llamando al programa externo: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "el programa externo finaliz� anormalmente\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "no se puede ejecutar el programa externo\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "no se puede leer la respuesta del programa externo: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "nunca     "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "construcci�n del paquete fallida: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "clave %08lX: sin identificador de usuario\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Ser� revocado por:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Este es una clave de revocaci�n confidencial)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "�Crear un certificado de revocaci�n para esta clave? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "se fuerza salida con armadura ASCII.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet fall�: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Certificado de revocaci�n creado.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "no se encuetran claves de revocaci�n para `%s'\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "clave secreta `%s' no encontrada: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "no existe la clave p�blica correspondiente: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "�la clave p�blica y la privada no se corresponden!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "algoritmo de protecci�n desconocido\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOTA: �Esta clave no est� protegida!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Certificado de revocaci�n creado.\n"
+"\n"
+"Por favor cons�rvelo en un medio que pueda esconder; si alguien consigue\n"
+"acceso a este certificado puede usarlo para inutilizar su clave.\n"
+"Es inteligente imprimir este certificado y guardarlo en otro lugar, por\n"
+"si acaso su medio resulta imposible de leer. Pero precauci�n: �el sistema\n"
+"de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
+"a otras personas!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Por favor elija una raz�n para la revocaci�n:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Raz�n para la revocaci�n: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(No se di� descripci�n)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "�Es correcto? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Lista de valores de confianza asignados, creada %s\n"
+"# (Use \"gpg --import-ownertrust\" para restablecerlos)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "no puede abrirse el fichero: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "l�nea demasiado larga\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "error: falta ':'\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "error: huella dactilar no v�lida\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "error: no hay valor de confianza del propietario\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "error econtrando registro de confianza: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "error de lectura: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "AVISO: el resumen `%s' no es parte de OpenPGP. ��selo bajo su "
+#~ "responsabilidad!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[ficheros]|cifra ficheros"
+
+#~ msgid "store only"
+#~ msgstr "s�lo almacenar"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[ficheros]|descifra ficheros"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "firma la clave no revocablemente"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "firma la clave localmente y no revocablemente"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "lista s�lo la secuencia de paquetes"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "exporta los valores de confianza"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "importa los valores de confianza"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "actualiza la base de datos de confianza"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "arregla una base de datos de confianza da�ada"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "quita la armadura de un fichero o de la entrada est�ndar"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "crea la armadura a un fichero o a la entrada est�ndar"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usa la clave por defecto como destinatario"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "no usa la terminal en absoluto"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "fuerza firmas v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "no fuerza firmas v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "fuerza firmas v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "no fuerza firmas v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "siempre usa un MDC para cifrar"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "nunca usa un MDC para cifrar"
+
+# usa
+# Vale.
+#~ msgid "use the gpg-agent"
+#~ msgstr "usa el agente gpg"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "proceso por lotes: nunca preguntar"
+
+# assume -> suponer, no asumir
+# No estoy seguro. El diccionario Collins en la acepci�n b) de asumir
+# dice "b) (suponer) to assume, suppose..."
+# 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.
+#~ msgid "assume yes on most questions"
+#~ msgstr "asume \"s�\" en casi todas las preguntas"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "asume \"no\" en casi todas las preguntas"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "a�ade este anillo a la lista de anillos"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "a�ade este anillo secreto a la lista"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "muestra en qu� anillos est� una clave"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|SERVIDOR|usa este servidor de claves"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
+
+#~ msgid "read options from file"
+#~ msgstr "lee opciones del fichero"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[fichero]|escribe informaci�n de estado en el fichero"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emula el modo descrito en la RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "todas las opciones de paquete, cifrado y resumen tipo OpenPGP"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr "todas las opciones de paquete, cifrado y resumen tipo PGP 2.x"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|usa modo de contrase�a N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE para las contrase�as"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usa el algoritmo de compresi�n N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "elimina campo keyid de los paquetes cifrados"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Muestra IDs fotogr�ficos"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "No muestra IDs fotogr�ficos"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Ajusta linea de comandos para ver IDs fotogr�ficos"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "el algoritmo de compresi�n `%s' es de s�lo lectura en esta versi�n\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: No hay seguridad que esta clave pertenezca realmente a su \n"
+#~ "proprietario pero se acepta igualmente\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "la preferencia %c%lu no es v�lida\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "clave %08lX: no es conforme a rfc2440 - omitida\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "NOTA: detectada clave primaria Elgamal - puede llevar algo de tiempo "
+#~ "importarla\n"
+
+#~ msgid " (default)"
+#~ msgstr "(por defecto)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  creada: %s expira: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Notaci�n: "
+
+#~ msgid "Policy: "
+#~ msgstr "Pol�tica: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "solicitando clave %08lX a %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "no puede obtenerse la clave en el servidor: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "error enviando a `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ 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"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "este servidor de clave no proporciona --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "buscando \"%s\" en el servidor HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "no puede buscarse en el servidor: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "clave %08lX: clave ElGamal generada por PGP que NO es segura para "
+#~ "firmar!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "clave %08lX creada %lu segundos en el futuro (salto en el tiempo o\n"
+#~ "problemas con el reloj)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "clave %08lX creada %lu segundos en el futuro (salto en el tiempo o\n"
+#~ "problemas con el reloj)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "clave %08lX marcada como de confianza absoluta\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "firma de clave Elgamal %08lX a %08lX descartada\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "firma de %08lX a la clave de firmado Elgamal %08lX descartada\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "comprobando en profundidad %d firmado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
+#~ "d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Seleccione el algoritmo que usar�.\n"
+#~ "\n"
+#~ "DSA (tambi�n conocido como DSS) es un algoritmo de firma digital que "
+#~ "s�lo\n"
+#~ "puede usarse para firmas. Es el algoritmo sugerido porque la "
+#~ "verificaci�n\n"
+#~ "de firmas DSA es mucho m�s r�pida que la de firmas ElGamal.\n"
+#~ "\n"
+#~ "ElGamal es un algoritmo que puede ser usado para firma y cifrado. "
+#~ "OpenPGP\n"
+#~ "distingue entre dos tipos de estos algoritmos: s�lo para cifrado y para\n"
+#~ "firma y cifrado. En realidad es lo mismo, pero se deben seleccionar "
+#~ "ciertos\n"
+#~ "par�metros de una forma particular para crear una clave segura para "
+#~ "firmas:\n"
+#~ "este programa lo hace as�, pero otras implementaciones de OpenPGP no "
+#~ "tienen\n"
+#~ "por qu� entender el tipo de firma y cifrado.\n"
+#~ "\n"
+#~ "La clave primaria debe ser una clave capaz de firmar, es por ello que la\n"
+#~ "opci�n de clave ElGamal s�lo para cifrado no est� disponible en este men�."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Aunque estas claves est�n definidas en RFC2440, no se aconseja su uso,\n"
+#~ "ya que no todos los programas pueden utilizarlas y las firmas creadas\n"
+#~ "con ellas son bastante grandes y lentas de verificar."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "hasta ahora procesadas %lu claves (%lu firmas)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "clave incompleta\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "clave %08lX incompleta\n"
+
 #, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "salir"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (firmar y cifrar)\n"
+
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
-#~ msgstr "reinicie GnuPG otra vez para que lea el nuevo fichero de opciones\n"
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "El uso de este algoritmo s�lo es posible con GnuPG. No ser� posible\n"
+#~ "comunicarse mediante esta clave con usuarios de PGP. Este algoritmo\n"
+#~ "es adem�s muy lento, y podr�a no ser tan seguro como otros.\n"
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "al cambiar permisos de `%s' ocurri� el fallo: %s\n"
+#~ msgid "Create anyway? "
+#~ msgstr "�Crear de todas formas?"
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "detectado algoritmo sim�trico inv�lido (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "este servidor de claves no es totalmente compatible con HKP\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr ""
+#~ "El uso de este algoritmo est� desaconsejado - �crear de todas formas?"
 
 #~ msgid "|NAME=VALUE|use this notation data"
 #~ msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
@@ -4729,6 +5794,12 @@ msgstr "%s: anillo creado\n"
 #~ msgid "             Fingerprint:"
 #~ msgstr "         Huella dactilar:"
 
+#~ msgid "you have to start GnuPG again, so it can read the new options file\n"
+#~ msgstr "reinicie GnuPG otra vez para que lea el nuevo fichero de opciones\n"
+
+#~ msgid "changing permission of  `%s' failed: %s\n"
+#~ msgstr "al cambiar permisos de `%s' ocurri� el fallo: %s\n"
+
 #, fuzzy
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "�Seguro que quiere una clave de este tama�o? "
@@ -4857,9 +5928,6 @@ msgstr "%s: anillo creado\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "error leyendo clave primaria para el LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record fallida: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "clave %08lX: petici�n de registro fallida\n"
 
@@ -4872,9 +5940,6 @@ msgstr "%s: anillo creado\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "clave %08lX: las claves p�blica y secreta no se corresponden\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "enumeraci�n de claves secretas fallida: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "clave %08lX.%lu: uni�n de subclave v�lida\n"
 
@@ -4933,9 +5998,6 @@ msgstr "%s: anillo creado\n"
 #~ msgid "lid %lu: inserted\n"
 #~ msgstr "lid %lu: insertada\n"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "error leyendo registro de directorio: %s\n"
-
 #~ msgid "\t%lu keys with errors\n"
 #~ msgstr "\t%lu claves con errores\n"
 
@@ -5029,9 +6091,6 @@ msgstr "%s: anillo creado\n"
 #~ msgid "do not write comment packets"
 #~ msgstr "no escribe paquetes de comentario"
 
-#~ msgid "(default is 1)"
-#~ msgstr "(por defecto es 1)"
-
 #~ msgid "(default is 3)"
 #~ msgstr "(por defecto es 3)"
 
@@ -5085,9 +6144,6 @@ msgstr "%s: anillo creado\n"
 #~ "la lista de b�squeda %lu[%d] de %lu no apunta a\n"
 #~ "un registro de directorio\n"
 
-#~ msgid "lid %lu does not have a key\n"
-#~ msgstr "lid %lu no dispone de clave\n"
-
 #~ msgid "lid %lu: can't get keyblock: %s\n"
 #~ msgstr "lid %lu: no puedo obtener el bloque de clave: %s\n"
 
@@ -5130,12 +6186,6 @@ msgstr "%s: anillo creado\n"
 #~ msgid "error writing keyring `%': %s\n"
 #~ msgstr "error escribiendo anillo `%s': %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "no puede abrirse el fichero: %s\n"
-
-#~ msgid "read error: %s\n"
-#~ msgstr "error de lectura: %s\n"
-
 #~ msgid "writing keyblock\n"
 #~ msgstr "escribiendo bloque de claves\n"
 
@@ -5153,13 +6203,6 @@ msgstr "%s: anillo creado\n"
 #~ msgid "Usage: gpgm [options] [files] (-h for help)"
 #~ msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
 
-#~ msgid ""
-#~ "Syntax: gpgm [options] [files]\n"
-#~ "GnuPG maintenance utility\n"
-#~ msgstr ""
-#~ "Sintaxis: gpgm [opciones] [ficheros]\n"
-#~ "Utilidad de mantenimiento de GnuPG\n"
-
 #~ msgid "usage: gpgm [options] "
 #~ msgstr "uso: gpgm [opciones] "
 
@@ -5187,25 +6230,9 @@ msgstr "%s: anillo creado\n"
 #~ msgid "user '%s' not in trustdb\n"
 #~ msgstr "usuario '%s' no est� en la tabla de confianza\n"
 
-#~ msgid ""
-#~ "# List of assigned trustvalues, created %s\n"
-#~ "# (Use \"gpgm --import-ownertrust\" to restore them)\n"
-#~ msgstr ""
-#~ "# Lista de valores de confianza, creada el %s\n"
-#~ "# (Puede usar \"gpgm --import-ownertrust\" para restablecerlos)\n"
-
 #~ msgid "directory record w/o primary key\n"
 #~ msgstr "registro de directorio sin clave primaria\n"
 
-#~ msgid "error: missing colon\n"
-#~ msgstr "error: falta ':'\n"
-
-#~ msgid "error: invalid fingerprint\n"
-#~ msgstr "error: huella dactilar no v�lida\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "error: no hay valor de confianza del propietario\n"
-
 #~ msgid "key not in trustdb, searching ring.\n"
 #~ msgstr "la clave no est� en tabla de confianza, buscando en el anillo.\n"
 
diff --git a/po/et.po b/po/et.po
index 0cbbbaf4a..2112fcc89 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,59 +1,76 @@
 # Estonian translations for gnupg.
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Toomas Soome <[email protected]>, 2002.
+# Toomas Soome <[email protected]>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-05-10 08:47+0300\n"
-"Last-Translator: Toomas Soome <[email protected]>\n"
+"Project-Id-Version: gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-17 11:04+0300\n"
+"Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "Hoiatus: kasutan ebaturvalist m�lu!\n"
+msgstr "HOIATUS: kasutan ebaturvalist m�lu!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "jah"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "ei"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "eE"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "v�lju"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "vV"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "�ldine viga"
@@ -250,7 +267,6 @@ msgstr "kr�ptimata"
 msgid "not processed"
 msgstr "ei t��deldud"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "mittekasutatav avalik v�ti"
@@ -263,73 +279,80 @@ msgstr "mittekasutatav salajane v�ti"
 msgid "keyserver error"
 msgstr "v�tmeserveri viga"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... see on viga (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "m�rkus: random_seed fail on t�hi\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "hoiatus: vigane random_seed faili suurus - ei kasuta\n"
+msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ei �nnestu lugeda: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ei �nnestu kirjutada: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -354,7 +377,31 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "s�numil�hendi algoritm `%s' ei ole selles versioonis muudetav\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Palun oodake, kogutakse entroopiat. Igavuse v�ltimiseks v�ite teha arvutiga\n"
+"mingit t��d, see t�stab ka entroopia kvaliteeti.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -362,163 +409,128 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[failid]|kr�pteeri failid"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "ainult salvesta"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[failid]|dekr�pteeri failid"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "allkirjasta v�ti mitte-t�histatavana"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "allkirjasta v�ti lokaalselt ja mitte-t�histatavana"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "n�ita ainult pakettide j�rjendeid"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "ekspordi usalduse v��rtused"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "impordi usalduse v��rtused"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "hooldusvaba usalduse andmebaasi uuendamine"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "paranda vigane usalduse andmebaas"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "Pakenda fail v�i standardsisend lahti"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "Pakenda fail v�i standardsisend"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -528,195 +540,55 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NIMI|kasuta NIME vaikimisi saajana"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "ole m�nev�rra vaiksem"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "�ra kasuta terminali"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "kasuta v3 allkirju"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "�ra kasuta v3 allkirju"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "kasuta v4 v�tme allkirju"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "�ra kasuta v3 v�tme allkirju"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "kr�ptimisel kasuta alati MDC"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "kr�ptimisel �ra kasuta kunagi MDC"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "kasuta gpg-agenti"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "pakettmood: �ra k�si kunagi"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "eelda enamus k�simustele jah vastust"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "eelda enamus k�simustele ei vastust"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
+msgstr "k�si enne �lekirjutamist"
 
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "lisa see salajaste v�tmete hoidla nimekirja"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|kasuta seda v�tmeserverit"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NIMI|terminali kooditabel on NIMI"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "loe v�tmed failist"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[fail]|kirjuta olekuinfo faili"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FAIL|lae laiendusmoodul FAIL"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
-
-#: g10/g10.c:443
-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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|kasuta parooli moodi N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|kasuta pakkimisalgoritmi N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "�ra lisa kr�ptimisel v�tme id"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Esita foto IDd"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "Ei esita foto IDd"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "Sea k�surida foto ID vaatamiseks"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -724,7 +596,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -744,15 +616,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -762,7 +634,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -770,446 +642,648 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Avalik v�ti: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "�iffer: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "R�si: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Pakkimine: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1193
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "Hoiatus: ebaturvaline omanik %s \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1196
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "Hoiatus: ebaturvalised �igused %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1202
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "Hoiatus: ebaturvaline omanik %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1205
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "Hoiatus: ebaturvalised �igused %s \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1208
 #, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "tundmatu seade \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
+msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
-msgstr ""
+msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: vigane faili versioon %d\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "vigased ekspordi v�tmed\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: vigased impordi v�tmed\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "vigane pakend"
+msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: vigane faili versioon %d\n"
+msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "vigane v�tmehoidla"
+msgstr "vigased ekspordi v�tmed\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: vigased impordi v�tmed\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "vigased impordi v�tmed\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: vigased ekspordi v�tmed\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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:1737
+#: g10/g10.c:2441
 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:1743
+#: g10/g10.c:2447
 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:1756
+#: g10/g10.c:2460
 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:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "see teade ei pruugi olla PGP 2.x programmidega kasutatav\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "valitud l�hendi algoritm ei ole lubatud\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1845
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 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:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "vigased eelistused\n"
+msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "vigased eelistused\n"
+msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "vigased eelistused\n"
+msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "vigased eelistused\n"
+msgstr "vigased isikliku pakkimise eelistused\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s ei t��ta veel koos %s-ga\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [failinimi]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [failinimi]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ei �nnestu avada: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "v�tme eksport eba�nnestus: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "vigane teatel�hendi algoritm `%s'\n"
+msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+
+#: g10/g10.c:3678
 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:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "antud allkirja poliisi URL on vigane\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "ole m�nev�rra vaiksem"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "v�ta v�tmed sellest v�tmehoidlast"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "teata ajatemplite konfliktist ainult hoiatusega"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"S�ntaks: gpg [v�tmed] [failid]\n"
+"kontrolli allkirju tuntud usaldusv��rsete v�tmetega\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "vigane pakendi p�is: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "pakendi p�is: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "vigane avateksti allkirja p�is\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "avateksti allkirjad �ksteise sees\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne failil�pp (puudub CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne failil�pp (poolik CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "enneaegne failil�pp (l�petaval real)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "P�hjus puudub"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "V�ti on asendatud"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "V�ti on kompromiteeritud"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "V�ti ei ole enam kasutusel"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "T�histamise p�hjus: "
+msgstr "t�histamise p�hjus: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "T�histamise kommentaar: "
+msgstr "t�histamise kommentaar: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iItTvVjJ"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Usalduse v��rtus puudub:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                 ka \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                 ka \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1221,187 +1295,205 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = Ei tea\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = EI usalda\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Usaldan absoluutselt\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " t = tagasi p�himen��sse\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " v = v�lju\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Kas te t�esti soovite seda v�tit absoluutselt usaldada? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "v�ti %08lX: v�ti on t�histatud!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Kasutan seda v�tit ikka? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "v�ti %08lX: alamv�ti on t�histatud!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: v�ti on aegunud\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Me EI usalda seda v�tit\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
-msgstr ""
-"%08lX: Ei ole kindel, et see v�ti t�esti kuulub omanikule,\n"
-"aktsepteerime seda siiski\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "See v�ti kuulub meile\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"EI ole kindel, et see v�ti kuulub tema omanikule.\n"
-"Kui te *t�esti* teate, mida te teete, v�ite j�rgnevale\n"
-"k�simusele vastata jaatavalt\n"
+"EI ole kindel, et see v�ti kuulub isikule, keda mainitakse\n"
+"kasutaja ID v�ljal. Kui te *t�esti* teate, mida te teete,\n"
+"v�ite j�rgnevale k�simusele vastata jaatavalt\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "HOIATUS: see v�ti v�ib olla t�histatud (t�histamise v�tit pole)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "M�rkus: See v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "M�rkus: See v�ti on aegunud!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, 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:811
+#: g10/pkclist.c:829
 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1409,130 +1501,126 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 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:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: 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:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "lubamatu s�mbol eelistuste s�nes\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "liiga palju `%c' eelistusi\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "lubamatu s�mbol eelistuste s�nes\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "kirjutan iseenda allkirja\n"
+msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
+msgstr "   (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1545,36 +1633,28 @@ msgstr ""
 "            vaikimisi v�tmepikkus on 1024 bitti\n"
 "    suurim soovitatav v�tmepikkus on 2048 bitti\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA lubab v�tmepikkuseid ainult vahemikus 512 kuni 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 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"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1582,11 +1662,11 @@ msgstr ""
 "Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
 "arvutused v�tavad V�GA palju aega!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1594,17 +1674,17 @@ msgstr ""
 "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
 "v�imalikud r�ndeobjektid!\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1620,7 +1700,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1636,30 +1716,29 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1667,11 +1746,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1686,44 +1765,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1734,27 +1813,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1762,16 +1841,16 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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 +1862,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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,53 +1874,58 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "vabandust, seda ei saa pakettmoodis teha\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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,570 +1934,649 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Loon t�esti? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ei �nnestu avada: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "kasutan �iffrit %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: HOIATUS: t�hi fail\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
-
-#: g10/encode.c:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "See k�sklus ei ole %s moodis lubatud.\n"
+msgstr ""
+"pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s kr�ptitud kasutajale: %s\n"
+msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/export.c:222
-#, 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:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "            imporditud: %lu"
+msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "v�ti %08lX: kasutaja ID puudub\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
 
-#: g10/import.c:597
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:612
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
-"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:619
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "v�ti %08lX: kasutaja ID puudub\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr ""
+"v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 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:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "v�ti %08lX: avalik v�ti on imporditud\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "v�ti %08lX: 1 uus kasutaja ID\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "v�ti %08lX: %d uut kasutaja IDd\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "v�ti %08lX: 1 uus allkiri\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "v�ti %08lX: %d uut allkirja\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "v�ti %08lX: 1 uus alamv�ti\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
+
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "v�ti %08lX: %d uut alamv�tit\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:774
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "v�ti %08lX: ei muudetud\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "v�ti %08lX: t�histamise sertifikaat imporditud\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "v�ti %08lX: vigane alamv�tme seos\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "v�ti %08lX: vigane alamv�tme seos\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "v�ti %08lX: vigane alamv�tme seos\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1698
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"Hoiatus: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
+"HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1403
+#: g10/import.c:1711
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"Hoiatus: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
+"HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "v�ti %08lX: t�histamise sertifikaat lisatud\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 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:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Usaldan v�hesel m��ral\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Usaldan t�iesti\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 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:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "HOIATUS: `%s' on t�hi fail\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
+
+#: g10/keyedit.c:584
+#, 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"
+"Iseenda allkiri \"%s\"\n"
+"on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
 msgstr ""
-"Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
+"Teie praegune allkiri \"%s\"\n"
+"on aegunud.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2422,50 +2585,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 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:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 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:535
+#: g10/keyedit.c:759
 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:537
+#: g10/keyedit.c:761
 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:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2475,27 +2642,31 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, 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:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2503,32 +2674,31 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
+msgstr ""
+"\n"
+"See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"Allkiri m�rgitakse mitte-eksporditavaks.\n"
+"HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
+"HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2536,7 +2706,7 @@ msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2544,7 +2714,7 @@ msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2552,7 +2722,7 @@ msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2560,7 +2730,7 @@ msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2568,33 +2738,34 @@ msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2602,7 +2773,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2610,470 +2781,568 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "v"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "vali sekundaarne v�ti N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "n�ita allkirju"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "allkirjasta v�ti"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "loo eraldiseisev allkiri"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "allkirjasta v�ti kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "allkirjasta v�ti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "lisa foto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "lisa sekundaarne v�ti"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "addkey"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "lisa sekundaarne v�ti"
+msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primaarne"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "l�lita"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "uuendatud eelistused"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "v�tmeserveri viga"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "ei saa parsida v�tmeserveri URI\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "t�hista kasutaja ID"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "n�ita foto ID"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, 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:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Kas t�histan t�esti selle kasutaja ID? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "sea eelistuste nimekiri"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Teatel�hend: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Omadused: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, 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"
+msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (tundlik)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[t�histatud] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [aegub: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [aegub: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! alamv�ti on t�histatud: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- leitud v�ltsitud t�histamine\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
 
-#: g10/keyedit.c:1837
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[t�histatud] "
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 #, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
+
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
-"Tuleb t�hele panna, et kuni te pole programmi uuesti k�ivitanud,ei pruugi "
+"Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[t�histatud] "
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[aegunud] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
+"              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3082,476 +3351,615 @@ 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:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 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:2012
+#: g10/keyedit.c:2410
 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:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
+"         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Sisestage v�tmepikkus"
+msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
+"Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
+msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne v�ti numbriga %d puudub\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "lokaalselt allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 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:2931
+#: g10/keyedit.c:3512
 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Allkirja poliitika: "
+msgstr "Kriitiline allkirja poliitika: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Allkirja noteerimine: "
+msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [aegub: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[t�histatud] "
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "n�ita v�tmeid ja s�rmej�lgi"
+msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "     V�tme s�rmej�lg ="
+msgstr "    Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "     V�tme s�rmej�lg ="
+msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "     V�tme s�rmej�lg ="
+msgstr "     Alamv�tme s�rmej�lg:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "vigane teatel�hendi algoritm `%s'\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "halb parool v�i tundmatu �ifri algoritm (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "kr�pteeritud kasutades %lu parooli\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "kr�pteeritud �he parooliga\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Noteering: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Poliis: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Allkiri aegus %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                 ka \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "V�tme leiate: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Allkiri aegus %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Allkiri aegub %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binaarne"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "tekstimood"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "tundmatu"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 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:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "HOIATUS: v�tit %s ei soovitata kasutada.\n"
+msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "HOIATUS: v�tit %s ei soovitata kasutada.\n"
+msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "palun kasutage selle asemel \"--keyserver-options %s\"\n"
+msgstr "palun kasutage selle asemel \"%s%s\"\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Pakkimata"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Pakkimata"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "loen v�tmeid failist `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "tundmatu vaikimisi saaja `%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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
+"v�ti\n"
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "agendile ei �nnestu seada kliendi pid\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "agendiga suhtlemiseks ei �nnestu saada lugemise FD\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "agendiga suhtlemiseks ei �nnestu saada kirjutamise FD\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3562,32 +3970,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Sisestage parool\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Sisestage parool\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "liiga pikk parool\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "vigane vastus agendilt\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "pakettmoodis ei saa parooli k�sida\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Sisestage parool: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3597,253 +4013,256 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "pakettmoodis ei saa parooli k�sida\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Sisestage parool: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anon��mne teate saaja.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, 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:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "v�ti %08lX: v�ti on t�histatud!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "k�sin v�tit %08lX HKP v�tmeserverist %s\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "v�tmeserverist ei saa v�tit: %s\n"
+msgstr "M�RKUS: v�ti on t�histatud"
 
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "viga teate saatmisel serverile `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "teate saatmine serverile `%s' �nnestus (olek=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "otsin \"%s\" HKP serverist %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "v�tmeserverist ei saa otsida: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Vigane parool; palun proovige uuesti"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "loon salajase v�tme kaitseks mittesoovitavat 16 bitist kontrollsummat\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
-msgstr ""
+msgstr "HOIATUS: allkirja l�hend on teatega konfliktne\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:99
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
-msgstr ""
-"see on PGP genereeritud ElGamal v�ti ja EI OLE allkirjastamiseks turvaline!\n"
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "HOIATUS: allkirjastamise alamv�tmel %08lX on vigane rist-sertifikaat\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "avalik v�ti on %lu sekund uuem, kui allkiri\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "avalik v�ti on %lu sekundit uuem, kui allkiri\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "avalik v�ti %08lX on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
+
+#: g10/sig-check.c:532
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "eeldan tundmatu kriitilise biti t�ttu vigast allkirja\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:558
 #, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "v�ti %08lX: alamv�tme allkirjaga sidumiseks puudub alamv�ti\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) v�tme allkirja lisada\n"
+
+#: g10/sign.c:112
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
+"HOIATUS: noteerimise %%-asendus eba�nnestus (liiga suur). Kasutan "
+"kompaktset.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "poliisi URLi ei saa v3 v�tme (PGP 2.x) allkirjadesse panna\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:151
-#, c-format
+#: g10/sign.c:187
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "%s allkiri kasutajalt: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 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"
+msgstr ""
+"PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
+msgstr ""
+"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -3858,12 +4277,12 @@ msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -3872,195 +4291,264 @@ msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ei �nnestu kasutada: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: ei �nnestu luua lukku\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: ei �nnestu seada lukku\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ei �nnestu luua: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei �nnestu: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "M�RKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "mitte kunagi"
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "trustdb kontrolliks puudub vajadus\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "trustdb kontrolliks puudub vajadus\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "ei leia avalikku v�tit %08lX: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "palun tehke --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "ei leia avalikku v�tit %08lX: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
-"kontrollin s�gavusel %d allkirjastatud=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4070,7 +4558,7 @@ msgstr ""
 "Palun pidage meeles, et allkirja fail (.sig v�i .asc)\n"
 "peab olema k�sureal esimene fail.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
@@ -4095,15 +4583,14 @@ msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4122,26 +4609,31 @@ msgstr "%s: tundmatu suffiks\n"
 msgid "Enter new filename"
 msgstr "Sisestage uus failinimi"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "kirjutan standardv�ljundisse\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: uus omaduste fail on loodud\n"
+msgstr "uus omaduste fail `%s' on loodud\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: kataloog on loodud\n"
@@ -4166,45 +4658,45 @@ msgstr ""
 "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
 "d korda!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�uab 160 bitist r�sialgoritmi kasutamist\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(kui te just ei m��ra v�tit s�rmej�ljega)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "pakettmoodis ei �nnestu seda v�tmeta teha \"--yes\"\n"
+msgstr "pakettmoodis ei �nnestu seda teha v�tmeta \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Kustutan selle v�tme v�tmehoidlast? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "See on salajane v�ti! - kas kustutan t�esti? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "omaniku usalduse info puhastatud\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4213,7 +4705,7 @@ msgstr ""
 "Teie �lesanne on sisestada n��d v��rtus; seda v��rtust ei avalikustata\n"
 "kolmandatele pooltele. Seda v��rtust on vaja et realiseerida usaldusv�rk."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4225,84 +4717,54 @@ msgstr ""
 "on teil juurdep��s ka nende salajastele v�tmetele. Kui soovite\n"
 "m��rata seda v�tit absoluutselt usaldatavaks, vastake \"jah\"\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Kui te ikkagi soovite kasutada seda kehtetut v�tit, vastake \"jah\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Kui te ikkagi soovite kasutada seda mitteusaldatavat v�tit, vastake \"jah\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Sisestage kasutaja ID aadressile, kellele te soovite teadet saata."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Valige kasutatav algoritm.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (ka DSS) on digitaalallkirja algoritm, mida saab kasutada ainult\n"
-"allkirjades. See on soovitatav algoritm, kuna DSA allkirjade kontroll\n"
-"on oluliselt kiirem ElGamal allkirjade kontrollimisest.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal on algoritm, mida saab kasutada nii allkirjastamisel, kui ka\n"
-"kr�ptimisel. OpenPGP eristab selle algoritmi kahte varianti: ainult\n"
-"kr�ptivat ja kr�ptivat ning allkirjastavat. Algoritm on sama, aga\n"
-"turvaliseks allkirjastamiseks on vaja valida sobivad parameetrid. See\n"
-"programm toetab m�lemat varianti, aga teised OpenPGP realisatsioonid\n"
-"ei pruugi kr�ptivat ning allkirjastavat v�imalust tunda.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"Esimene (primaarne) v�ti peab alati olema selline, mida saab kasutada\n"
-"allkirjastamisel; see on ka p�hjus, miks selles men��s ei lubata valida\n"
-"ainult kr�ptivat ElGamal v�tit."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Kuigi need v�tmed on kirjeldatud dokumendis RFC2440, ei ole nende\n"
-"kasutamine soovitatav, kuna mitte k�ik programmid ei toeta neid\n"
-"ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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 ""
+"�ldiselt ei ole hea m�te kasutada sama v�tit allkirjastamiseks ja\n"
+"kr�pteerimiseks. Seda algoritmi tuleks kasutada ainult teatud piirides.\n"
+"Enne kasutamist konsulteerige palun oma turva eksperdiga."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Sisestage v�tmepikkus"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Vastake \"jah\" v�i \"ei\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4314,19 +4776,19 @@ msgstr ""
 "saa korrektset veateadet, kuna s�steem �ritab antud v��rtust\n"
 "t�lgendada vahemikuna."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Sisestage v�tmehoidja nimi"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 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:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Te v�ite n��d sisestada kommentaari"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4340,11 +4802,11 @@ msgstr ""
 "O  et j�tkata v�tme loomist.\n"
 "V  et l�petada v�tme loomine."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4415,11 +4877,11 @@ msgstr ""
 "\n"
 "Kui te ei tea �iget vastust, vastake \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4427,11 +4889,11 @@ msgstr ""
 "Kui te t�esti soovite seda kasutaja IDd kustutada, vastake \"jah\".\n"
 "Sertifikaadid kustutatakse samuti!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Kui selle alamv�tme v�ib kustutada, vastake \"jah\""
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4441,7 +4903,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4453,13 +4915,13 @@ msgstr ""
 "kasutab, sest see v�ti v�ib moodustada usaldussuhte l�bi m�ne juba\n"
 "sertifitseeritud v�tme."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 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:229
+#: g10/helptext.c:218
 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"
@@ -4473,7 +4935,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:237
+#: g10/helptext.c:226
 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"
@@ -4483,23 +4945,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:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4507,7 +4969,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4536,7 +4998,7 @@ msgstr ""
 "      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
 "aadressi.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4546,101 +5008,625 @@ msgstr ""
 "soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
 "l�hidalt. T�hi rida l�petab teksti.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ei ole muudetud\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uus\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "kontrollin v�tmehoidlat `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "seni on kontrollitud %lu v�tit (%lu allkirja)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#, fuzzy
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Valige foto ID'na kasutatav pilt. Pilt peab olema JPEG fail.\n"
+"Pidage meeles, et pilt salvestatakse teie avalikus v�tmes. Kui kasutate\n"
+"v�ga suurt pilti, on ka k�ti v�ha suur!\n"
+"M�istlik pildi suurus v�iks olla umbes 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Fotot \"%s\" ei �nnestu avada: %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\": ei ole JPEG fail\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "On see foto �ige (j/E/v)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "foto ID ei saa n�idata!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "mittelokaalse programmi k�ivitamist ei toetata\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"v�liste programmide k�ivitamine on blokeeritud, kuna seadete failil on\n"
+"ebaturvalised �igused\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"see platvorm n�uab v�liste programmide k�ivitamiseks ajutiste failide "
+"kasutamist\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "s�steemi viga v�lise programmi kasutamisel: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "v�line programm l�petas erandlikult\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "v�list programmi ei �nnestu k�ivitada\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "ei �nnestu lugeda v�lise programmi vastust: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "mitte kunagi"
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet eba�nnestus: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "v�ti %08lX: kasutaja ID puudub\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "T�histaja:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(See on tundlik t�histamise v�ti)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet eba�nnestus: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "T�histamise sertifikaat on loodud.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr ""
+"`%s' jaoks pole t�histamise v�tmeid\n"
+"\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "salajast v�tit `%s' ei leitud: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "vastavat avalikku v�tit pole: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "tundmatu kaitsealgoritm\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"T�histamise sertifikaat on loodud.\n"
+"\n"
+"Palun salvestage see andmekandjale, mida saate kindlasse kohta �ra panna.\n"
+"Kui mallory saab sellele sertifikaadile juurdep��su, v�ib ta seda kasutades\n"
+"muuta k�ik teie v�tmed kasutamisk�lbmatuks.\n"
+"Samuti on m�istlik tr�kkida see sertifikaat paberile ja panna hoiule "
+"juhuks,\n"
+"kui meedia muutub loetamatuks. Aga olge ettevaatlik: teie arvuti "
+"tr�kis�steem\n"
+"v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Palun valige t�histamise p�hjus:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Katkesta"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(T�en�oliselt soovite siin valida %d)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "T�histamise p�hjus: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Kirjeldust ei antud)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "On see h�sti? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Omistatud usalduse v��rtuste loend, loodud: %s\n"
+"# (Taastamiseks kasutage \"gpg --import-ownertrust\")\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "faili ei �nnestu avada: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "rida on liiga pikk\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "viga: puudub koolon\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "viga: vigane s�rmej�lg\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "viga: usalduse v��rtus puudub\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "viga usalduse kirje otsimisel: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "viga lugemisel: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "HOIATUS: s�numil�hend `%s' ei ole OpenPGP osa.  Kasutamine omal "
+#~ "vastutusel!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[failid]|kr�pteeri failid"
+
+#~ msgid "store only"
+#~ msgstr "ainult salvesta"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[failid]|dekr�pteeri failid"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "allkirjasta v�ti mitte-t�histatavana"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "allkirjasta v�ti lokaalselt ja mitte-t�histatavana"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "n�ita ainult pakettide j�rjendeid"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "ekspordi usalduse v��rtused"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "impordi usalduse v��rtused"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "hooldusvaba usalduse andmebaasi uuendamine"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "paranda vigane usalduse andmebaas"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Pakenda fail v�i standardsisend lahti"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Pakenda fail v�i standardsisend"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "�ra kasuta terminali"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "kasuta v3 allkirju"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "�ra kasuta v3 allkirju"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "kasuta v4 v�tme allkirju"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "�ra kasuta v3 v�tme allkirju"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "kr�ptimisel kasuta alati MDC"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "kr�ptimisel �ra kasuta kunagi MDC"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "kasuta gpg-agenti"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "pakettmood: �ra k�si kunagi"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "eelda enamus k�simustele jah vastust"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "eelda enamus k�simustele ei vastust"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "lisa see salajaste v�tmete hoidla nimekirja"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|kasuta seda v�tmeserverit"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NIMI|terminali kooditabel on NIMI"
+
+#~ msgid "read options from file"
+#~ msgstr "loe v�tmed failist"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[fail]|kirjuta olekuinfo faili"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FAIL|lae laiendusmoodul FAIL"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|kasuta parooli moodi N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|kasuta pakkimisalgoritmi N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "�ra lisa kr�ptimisel v�tme id"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Esita foto IDd"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Ei esita foto IDd"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Sea k�surida foto ID vaatamiseks"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "pakkimise algoritm `%s' on selles versioonis ainult lugemiseks\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
+
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
 #~ msgstr ""
-#~ "te peate GnuPG uuesti k�ivitama, siis v�etakse uued v�tmed arvesse\n"
+#~ "%08lX: Ei ole kindel, et see v�ti t�esti kuulub omanikule,\n"
+#~ "aktsepteerime seda siiski\n"
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "`%s' �iguste muutmine eba�nnestus: %s\n"
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "eelistus %c%lu ei ole lubatud\n"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "v�ti %08lX: ei ole rfc2440 v�ti - j�tsin vahele\n"
 
 #~ 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"
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "M�RKUS: Tuvastasin Elgamal primaarv�tme - importimine v�ib v�tta m�ne "
+#~ "aja\n"
+
+#~ msgid " (default)"
+#~ msgstr " (vaikimisi)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Noteering: "
+
+#~ msgid "Policy: "
+#~ msgstr "Poliis: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "v�tmeserverist ei saa v�tit: %s\n"
 
-#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "viga teate saatmisel serverile `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "teate saatmine serverile `%s' �nnestus (olek=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "see v�tmeserver ei toeta --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "otsin \"%s\" HKP serverist %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "v�tmeserverist ei saa otsida: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "v�ti %08lX: see on PGP genereeritud ElGamal v�ti ja EI OLE "
+#~ "allkirjastamiseks turvaline!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "v�ti %08lX loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "v�ti %08lX loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "v�ti %08lX on m�rgitud abslouutselt usaldatavaks\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr ""
+#~ "j�tsin Elgamal allkirjastamise v�tme %08lX allkirja %08lX-le vahele\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr ""
+#~ "j�tsin %08lX allkirja Elgamal allkirjastamise v�tmele %08lX vahele\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "kontrollin s�gavusel %d allkirjastatud=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
+#~ "d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
 #~ msgstr ""
-#~ "punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
+#~ "Valige kasutatav algoritm.\n"
+#~ "\n"
+#~ "DSA (ka DSS) on digitaalallkirja algoritm, mida saab kasutada ainult\n"
+#~ "allkirjades. See on soovitatav algoritm, kuna DSA allkirjade kontroll\n"
+#~ "on oluliselt kiirem ElGamal allkirjade kontrollimisest.\n"
+#~ "\n"
+#~ "ElGamal on algoritm, mida saab kasutada nii allkirjastamisel, kui ka\n"
+#~ "kr�ptimisel. OpenPGP eristab selle algoritmi kahte varianti: ainult\n"
+#~ "kr�ptivat ja kr�ptivat ning allkirjastavat. Algoritm on sama, aga\n"
+#~ "turvaliseks allkirjastamiseks on vaja valida sobivad parameetrid. See\n"
+#~ "programm toetab m�lemat varianti, aga teised OpenPGP realisatsioonid\n"
+#~ "ei pruugi kr�ptivat ning allkirjastavat v�imalust tunda.\n"
+#~ "\n"
+#~ "Esimene (primaarne) v�ti peab alati olema selline, mida saab kasutada\n"
+#~ "allkirjastamisel; see on ka p�hjus, miks selles men��s ei lubata valida\n"
+#~ "ainult kr�ptivat ElGamal v�tit."
 
 #~ msgid ""
-#~ "WARNING: This key already has a photo ID.\n"
-#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "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"
+#~ "Kuigi need v�tmed on kirjeldatud dokumendis RFC2440, ei ole nende\n"
+#~ "kasutamine soovitatav, kuna mitte k�ik programmid ei toeta neid\n"
+#~ "ja nendega loodud allkirjad on suured ning kontrollimine aeglane."
 
-#~ msgid "You may only have one photo ID on a key.\n"
-#~ msgstr "V�tmel v�ib olla ainult �ks foto ID.\n"
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "seni on kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#~ msgid "Fingerprint:"
-#~ msgstr "S�rmej�lg:"
+#~ msgid "key incomplete\n"
+#~ msgstr "mittet�ielik v�ti\n"
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "               S�rmej�lg:"
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "v�ti %08lX ei ole t�ielik\n"
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 000000000..2ae03362c
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,5728 @@
+# GnuPG finnish translation
+# Copyright © 1998, 1999, 2000, 2001, 2003-2004 Free Software Foundation, Inc.
+# Jouni Hiltunen <[email protected]>, 2003.
+# Tommi Vainikainen <[email protected]>, 2003-2004.
+#
+# Suomennoksia:
+# compress algorithm = pakkausalgoritmi
+# digest, hash = tiiviste
+# digest, hash algorithm = tiivistealgoritmi
+# cipher (algorithm) = salain, salausalgoritmi
+# pub key algorithm = julkisen avaimen algoritmi
+#
+# revocation = mitätöinti-
+# certificate = varmeen
+# revocation list = sulkulista
+#
+# - policy = -käytäntö (esim. tietoturvakäytäntö, allekirjoituskäytäntö)
+# key ring = avainrengas
+#
+# armor = ascii-koodaus (saa ehdottaa jos keksii näppärämmän käännöksen)
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-16 22:40+0300\n"
+"Last-Translator: Tommi Vainikainen <[email protected]>\n"
+"Language-Team: Finnish <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: util/secmem.c:90
+msgid "WARNING: using insecure memory!\n"
+msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
+
+#: util/secmem.c:91
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
+
+#: util/secmem.c:340
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
+
+#: util/secmem.c:341
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
+
+#: util/miscutil.c:307 util/miscutil.c:344
+msgid "yes"
+msgstr "kyllä|kylla|joo"
+
+#: util/miscutil.c:308 util/miscutil.c:349
+msgid "yY"
+msgstr "kK"
+
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "ei"
+
+#: util/miscutil.c:311 util/miscutil.c:350
+msgid "nN"
+msgstr "eE"
+
+#: util/miscutil.c:348 g10/keyedit.c:1138
+msgid "quit"
+msgstr "lopeta|sulje"
+
+#: util/miscutil.c:351
+msgid "qQ"
+msgstr "lLsS"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "yleinen virhe"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "tuntematon pakettityyppi"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "tuntematon versio"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "tuntematon julkisen avaimen algoritmi"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "tuntematon tiivistealgoritmi"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "julkinen avain ei kelpaa"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "salainen avain ei kelpaa"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "allekirjoitus ei täsmää"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "tarkistussumma ei täsmää"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "väärä salasana"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "julkista avainta ei löydy"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "tuntematon salausalgoritmi"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "avainrenkaan avaaminen ei onnistu"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "virheellinen paketti"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "virheellinen ascii-koodaus"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "käyttäjätunnusta ei löydy"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "salaista avainta ei löydy"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "käytetty salainen avain on väärä"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "ei tuettu"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "avain ei kelpaa"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "virhe tiedostoa luettaessa"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "virhe tiedostoon kirjoitettaessa"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "tuntematon pakkausalgoritmi"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "virhe tiedostoa avattaessa"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "virhe tiedostoa luotaessa"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "väärä salasana"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "julkisen avaimen algoritmi ei ole käytössä"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "salausalgoritmi ei ole käytössä"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "tuntematon allekirjoitusluokka"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "luottamustietokantavirhe"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "MPI ei kelpaa"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "resurssiraja"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "virheellinen avainrengas"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "virheellinen varmenne"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "väärin muotoiltu käyttäjätunnus"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "virhe tiedostoa suljettaessa"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "virhe nimettäessä tiedostoa uudelleen"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "virhe tiedostoa poistettaessa"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "odottamatonta dataa"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "aikaleima ei täsmää"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "käyttökelvoton julkisen avaimen algoritmi"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "tiedosto on olemassa"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "heikko avain"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "virheellinen argumentti"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "URI ei kelpaa"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "URI-muotoa ei tueta"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "verkkovirhe"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "salaamaton"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "ei käsitelty"
+
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "julkista avainta ei voi käyttää"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "salaista avainta ei voi käyttää"
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr "avainpalvelinvirhe"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "...tämä on ohjelmistovika (%s:%d:%s)\n"
+
+#: util/logger.c:285
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
+
+#: cipher/random.c:163
+msgid "no entropy gathering module detected\n"
+msgstr "entropian keräysmoduulia ei havaittu\n"
+
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
+
+#: cipher/random.c:391
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
+
+#: cipher/random.c:396
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "\"%s\" on erikoistiedosto - ohitettiin\n"
+
+#: cipher/random.c:401
+msgid "note: random_seed file is empty\n"
+msgstr "huom: random_seed-tiedosto on tyhjä\n"
+
+#: cipher/random.c:407
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr ""
+"VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
+
+#: cipher/random.c:415
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
+
+#: cipher/random.c:453
+msgid "note: random_seed file not updated\n"
+msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
+
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+
+#: cipher/random.c:480
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "tiedostoon \"%s\" ei voi kirjoittaa: %s\n"
+
+#: cipher/random.c:483
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
+
+#: cipher/random.c:728
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n"
+
+#: cipher/random.c:729
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"Satunnaislukugeneraattori on pelkkä kulissi, joka mahdollistaa\n"
+"ohjelman ajamisen - se ei ole vahvasti satunnainen!\n"
+"\n"
+"ÄLÄ KÄYTÄ OHJELMAN TUOTTAMAA DATAA!!\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Satunnaislukuja ei ole vielä tarpeeksi.  Ole hyvä ja jatka työskentelyä \n"
+"antaaksesi käyttöjärjestelmälle mahdollisuuden kerätä lisää entropiaa! \n"
+"(Vielä tarvitaan %d tavua)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Ole hyvä ja odota, entropiaa kerätään. Tee jotain työtä, jos se vaikka \n"
+"estäisi sinua pitkästymästä.  Se nimittäin samalla parantaa entropian "
+"laatua.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
+
+#: g10/g10.c:354
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Komennot:\n"
+" "
+
+#: g10/g10.c:356
+msgid "|[file]|make a signature"
+msgstr "|[tiedosto]|tee allekirjoitus"
+
+#: g10/g10.c:357
+msgid "|[file]|make a clear text signature"
+msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
+
+#: g10/g10.c:358
+msgid "make a detached signature"
+msgstr "tee erillinen allekirjoitus"
+
+#: g10/g10.c:359
+msgid "encrypt data"
+msgstr "salaa tiedot"
+
+#: g10/g10.c:361
+msgid "encryption only with symmetric cipher"
+msgstr "salaa vain symmetrisellä salaimella"
+
+#: g10/g10.c:363
+msgid "decrypt data (default)"
+msgstr "avaa tiedot (oletus)"
+
+#: g10/g10.c:365
+msgid "verify a signature"
+msgstr "tarkista allekirjoitus"
+
+#: g10/g10.c:367
+msgid "list keys"
+msgstr "näytä avaimet"
+
+#: g10/g10.c:369
+msgid "list keys and signatures"
+msgstr "näytä avaimet allekirjoituksineen"
+
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "tarkista avainten allekirjoitukset"
+
+#: g10/g10.c:371
+msgid "list keys and fingerprints"
+msgstr "näytä avaimet sormenjälkineen"
+
+#: g10/g10.c:372
+msgid "list secret keys"
+msgstr "näytä salaiset avaimet"
+
+#: g10/g10.c:373
+msgid "generate a new key pair"
+msgstr "luo uusi avainpari"
+
+#: g10/g10.c:374
+msgid "remove keys from the public keyring"
+msgstr "poista avaimet julkisten avainten renkaasta"
+
+#: g10/g10.c:376
+msgid "remove keys from the secret keyring"
+msgstr "poista avaimet salaisten avainten renkaasta"
+
+#: g10/g10.c:377
+msgid "sign a key"
+msgstr "allekirjoita avain"
+
+#: g10/g10.c:378
+msgid "sign a key locally"
+msgstr "allekirjoita avain paikallisesti"
+
+#: g10/g10.c:381
+msgid "sign or edit a key"
+msgstr "allekirjoita tai muokkaa avainta"
+
+#: g10/g10.c:382
+msgid "generate a revocation certificate"
+msgstr "luo mitätöintivarmenne"
+
+#: g10/g10.c:384
+msgid "export keys"
+msgstr "vie avaimia"
+
+#: g10/g10.c:385
+msgid "export keys to a key server"
+msgstr "vie avaimia palvelimelle"
+
+#: g10/g10.c:386
+msgid "import keys from a key server"
+msgstr "nouda avaimia avainpalvelimelta"
+
+#: g10/g10.c:388
+msgid "search for keys on a key server"
+msgstr "etsi avaimia avainpalvelimelta"
+
+#: g10/g10.c:390
+msgid "update all keys from a keyserver"
+msgstr "päivitä kaikki avaimet avainpalvelimelta"
+
+#: g10/g10.c:393
+msgid "import/merge keys"
+msgstr "nouda/liitä avaimia"
+
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
+
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
+
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
+
+#: g10/g10.c:406
+msgid "update the trust database"
+msgstr "päivitä luottamustietokanta"
+
+#: g10/g10.c:413
+msgid "|algo [files]|print message digests"
+msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
+
+#: g10/g10.c:417 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Valitsimet:\n"
+" "
+
+#: g10/g10.c:419
+msgid "create ascii armored output"
+msgstr "tuota ascii-koodattu tuloste"
+
+#: g10/g10.c:421
+msgid "|NAME|encrypt for NAME"
+msgstr "|NIMI|salaa vastaanottajalle NIMI"
+
+#: g10/g10.c:432
+msgid "use this user-id to sign or decrypt"
+msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
+
+#: g10/g10.c:433
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
+
+#: g10/g10.c:438
+msgid "use canonical text mode"
+msgstr "käytä tekstimuotoa"
+
+#: g10/g10.c:448
+msgid "use as output file"
+msgstr "käytä tulostustiedostona"
+
+#: g10/g10.c:450 g10/gpgv.c:66
+msgid "verbose"
+msgstr "monisanainen"
+
+#: g10/g10.c:461
+msgid "do not make any changes"
+msgstr "älä tee muutoksia"
+
+#: g10/g10.c:462
+msgid "prompt before overwriting"
+msgstr "kysy ennen ylikirjoittamista"
+
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
+
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:535
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
+"sivuilta)\n"
+
+#: g10/g10.c:538
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"Esim:\n"
+" -se -r Pekka [tiedosto]    allekirjoita ja salaa Pekalle\n"
+" --clearsign [tiedosto]     tee tekstimuotoinen allekirjoitus\n"
+" --detach-sign [tiedosto]   tee erillinen allekirjoitus\n"
+" --list-keys [nimet]        näytä avaimet\n"
+" --fingerprint [nimet]      näytä sormenjäljet\n"
+
+#: g10/g10.c:713 g10/gpgv.c:91
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr ""
+"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
+
+#: g10/g10.c:730
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: g10/g10.c:733
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Syntaksi: gpg [valitsimet] [tiedostot]\n"
+"allekirjoita, tarkista, salaa tai avaa\n"
+"oletustoiminto riippuu syötteestä\n"
+
+#: g10/g10.c:744
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Tuetut algoritmit:\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "JulkAvain: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Salaus: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Tiiviste: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Pakkaus: "
+
+#: g10/g10.c:848
+msgid "usage: gpg [options] "
+msgstr "käyttö: gpg [valitsimet] "
+
+#: g10/g10.c:951
+msgid "conflicting commands\n"
+msgstr "ristiriitainen komento\n"
+
+#: g10/g10.c:969
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "tuntematon asetus \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
+
+#: g10/g10.c:1637
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
+
+#: g10/g10.c:1641
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "asetustiedosto \"%s\": %s\n"
+
+#: g10/g10.c:1648
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "luetaan asetukset tiedostosta \"%s\"\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
+
+#: g10/g10.c:1887
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
+
+#: g10/g10.c:2099
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s ei kelpaa merkistöksi\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
+
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: virheelliset vientivalitsimet\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "virheelliset vientivalitsimet\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: virheelliset tuontivalitsimet\n"
+
+#: g10/g10.c:2137
+msgid "invalid import options\n"
+msgstr "virheelliset tuontivalitsimet\n"
+
+#: g10/g10.c:2144
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: virheelliset vientivalitsimet\n"
+
+#: g10/g10.c:2147
+msgid "invalid export options\n"
+msgstr "virheelliset vientivalitsimet\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: virheelliset tuontivalitsimet\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "virheelliset tuontivalitsimet\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: virheelliset vientivalitsimet\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "virheelliset vientivalitsimet\n"
+
+#: g10/g10.c:2208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
+
+#: g10/g10.c:2398
+msgid "WARNING: program may create a core file!\n"
+msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
+
+#: g10/g10.c:2402
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "VAROITUS: %s korvaa %s:n\n"
+
+#: g10/g10.c:2411
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
+
+#: g10/g10.c:2414
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s ja %s yhdessä on järjetöntä!\n"
+
+#: g10/g10.c:2435
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
+
+#: g10/g10.c:2441
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
+
+#: g10/g10.c:2447
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr ""
+"sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
+
+#: g10/g10.c:2460
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
+
+#: g10/g10.c:2528 g10/g10.c:2552
+msgid "selected cipher algorithm is invalid\n"
+msgstr "valittu salausalgoritmi ei kelpaa\n"
+
+#: g10/g10.c:2534 g10/g10.c:2558
+msgid "selected digest algorithm is invalid\n"
+msgstr "valittu tiivistealgoritmi ei kelpaa\n"
+
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "valittu salausalgoritmi ei kelpaa\n"
+
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
+
+#: g10/g10.c:2561
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed täytyy olla suurempi kuin 0\n"
+
+#: g10/g10.c:2563
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth tulee olla välillä 1-255\n"
+
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
+
+#: g10/g10.c:2572
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr ""
+"HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
+
+#: g10/g10.c:2576
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
+
+#: g10/g10.c:2583
+msgid "invalid default preferences\n"
+msgstr "virheelliset oletusarvoiset valinnat\n"
+
+#: g10/g10.c:2592
+msgid "invalid personal cipher preferences\n"
+msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
+
+#: g10/g10.c:2596
+msgid "invalid personal digest preferences\n"
+msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
+
+#: g10/g10.c:2600
+msgid "invalid personal compress preferences\n"
+msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s ja %s eivät vielä toimi yhdessä\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
+
+#: g10/g10.c:2778
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
+
+#: g10/g10.c:2789
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+"VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
+
+#: g10/g10.c:2800
+msgid "--store [filename]"
+msgstr "--store [tiedostonimi]"
+
+#: g10/g10.c:2807
+msgid "--symmetric [filename]"
+msgstr "--symmetric [tiedostonimi]"
+
+#: g10/g10.c:2819
+msgid "--encrypt [filename]"
+msgstr "--encrypt [tiedostonimi]"
+
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [tiedostonimi]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
+
+#: g10/g10.c:2855
+msgid "--sign [filename]"
+msgstr "--allekirjoita [tiedostonimi]"
+
+#: g10/g10.c:2868
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [tiedostonimi]"
+
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [tiedostonimi]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
+
+#: g10/g10.c:2908
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [tiedostonimi]"
+
+#: g10/g10.c:2917
+msgid "--clearsign [filename]"
+msgstr "--clearsign [tiedostonimi]"
+
+#: g10/g10.c:2942
+msgid "--decrypt [filename]"
+msgstr "--decrypt [tiedostonimi]"
+
+#: g10/g10.c:2950
+msgid "--sign-key user-id"
+msgstr "--sign-key käyttäjätunnus"
+
+#: g10/g10.c:2954
+msgid "--lsign-key user-id"
+msgstr "--lsign-key käyttäjätunnus"
+
+#: g10/g10.c:2958
+msgid "--nrsign-key user-id"
+msgstr "--nrlsign-key käyttäjätunnus"
+
+#: g10/g10.c:2962
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key käyttäjätunnus"
+
+#: g10/g10.c:2986
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key käyttäjätunnus [komennot]"
+
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "tiedostoa %s ei voi avata: %s\n"
+
+#: g10/g10.c:3057
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
+
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "avaimen vienti epäonnistui: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
+
+#: g10/g10.c:3160
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "ascii-koodauksen purku epäonnistui: %s\n"
+
+#: g10/g10.c:3168
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "ascii-koodaaminen epäonnistui: %s\n"
+
+#: g10/g10.c:3255
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
+#: g10/g10.c:3378
+msgid "[filename]"
+msgstr "[tiedostonimi]"
+
+#: g10/g10.c:3382
+msgid "Go ahead and type your message ...\n"
+msgstr "Kirjoita viestisi...\n"
+
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "tiedostoa \"%s\" ei voi avata\n"
+
+#: g10/g10.c:3659
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
+"välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+
+#: g10/g10.c:3678
+msgid "a notation value must not use any control characters\n"
+msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
+
+#: g10/g10.c:3712
+msgid "the given certification policy URL is invalid\n"
+msgstr "annettu varmennekäytännön URL on virheellinen\n"
+
+#: g10/g10.c:3714
+msgid "the given signature policy URL is invalid\n"
+msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "ole jonkinverran hiljaisempi"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "ota avaimet tästä avainrenkaasta"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Käyttö: gpg [valitsimet] [tiedostot]\n"
+"Tarkista allekirjoituksia tunnetuille luotetuille avaimille\n"
+
+#: g10/armor.c:317
+#, c-format
+msgid "armor: %s\n"
+msgstr "ascii-koodaus: %s\n"
+
+#: g10/armor.c:346
+msgid "invalid armor header: "
+msgstr "epäkelpo ascii-koodausotsake: "
+
+#: g10/armor.c:353
+msgid "armor header: "
+msgstr "ascii-koodausotsake: "
+
+#: g10/armor.c:364
+msgid "invalid clearsig header\n"
+msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
+
+#: g10/armor.c:416
+msgid "nested clear text signatures\n"
+msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
+
+#: g10/armor.c:553
+msgid "invalid dash escaped line: "
+msgstr "epäkelpo viiva rivin lopussa: "
+
+#: g10/armor.c:565
+msgid "unexpected armor:"
+msgstr "odottamaton ascii-koodaus:"
+
+#: g10/armor.c:695 g10/armor.c:1276
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
+
+#: g10/armor.c:738
+msgid "premature eof (no CRC)\n"
+msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in CRC)\n"
+msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
+
+#: g10/armor.c:776
+msgid "malformed CRC\n"
+msgstr "väärinmuotoiltu CRC\n"
+
+#: g10/armor.c:780 g10/armor.c:1313
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "CRC-virhe; %06lx - %06lx\n"
+
+#: g10/armor.c:800
+msgid "premature eof (in Trailer)\n"
+msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
+
+#: g10/armor.c:804
+msgid "error in trailer line\n"
+msgstr "virhe trailer-rivissä\n"
+
+#: g10/armor.c:1091
+msgid "no valid OpenPGP data found.\n"
+msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
+
+#: g10/armor.c:1096
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
+
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"quoted printable -koodattu merkki ascii-koodauksessa - luultavasti "
+"viallista\n"
+"MTA:ta on käytetty\n"
+
+#: g10/pkclist.c:61 g10/revoke.c:576
+msgid "No reason specified"
+msgstr "Ei eriteltyä syytä"
+
+#: g10/pkclist.c:63 g10/revoke.c:578
+msgid "Key is superseded"
+msgstr "Avain on uusittu"
+
+#: g10/pkclist.c:65 g10/revoke.c:577
+msgid "Key has been compromised"
+msgstr "Avain on murrettu"
+
+#: g10/pkclist.c:67 g10/revoke.c:579
+msgid "Key is no longer used"
+msgstr "Avain ei ole enää käytössä"
+
+#: g10/pkclist.c:69 g10/revoke.c:580
+msgid "User ID is no longer valid"
+msgstr "Käyttäjätunnus ei ole enää käytössä"
+
+#: g10/pkclist.c:73
+msgid "reason for revocation: "
+msgstr "mitätöinnin syy: "
+
+#: g10/pkclist.c:90
+msgid "revocation comment: "
+msgstr "mitätöintikommentti: "
+
+#: g10/pkclist.c:195
+msgid "iImMqQsS"
+msgstr "iImMlLoO"
+
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
+msgstr ""
+"Luottamusarvoa ei ole asetettu seuraavalle:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                aka \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                aka \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+"Miten paljon luotat tämän käyttäjän varmistamiin muiden käyttäjien \n"
+"avaimiin (tarkistaako hän henkilöllisyydet, vertaako sormenjälkiä eri \n"
+"lähteistä...)?\n"
+"\n"
+
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = En tiedä\n"
+
+#: g10/pkclist.c:252
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = EN luota\n"
+
+#: g10/pkclist.c:254
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = Luotan osittain\n"
+
+#: g10/pkclist.c:256
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = Luotan täysin\n"
+
+#: g10/pkclist.c:258
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = Luotan ehdottomasti\n"
+
+#: g10/pkclist.c:261
+msgid " i = please show me more information\n"
+msgstr " i = näytä lisätietoja\n"
+
+#: g10/pkclist.c:264
+msgid " m = back to the main menu\n"
+msgstr " m = takaisin päävalikkoon\n"
+
+#: g10/pkclist.c:267
+msgid " s = skip this key\n"
+msgstr " o = ohita tämä avain\n"
+
+#: g10/pkclist.c:268
+msgid " q = quit\n"
+msgstr " l = lopeta\n"
+
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
+msgid "Your decision? "
+msgstr "Valintasi? "
+
+#: g10/pkclist.c:299
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "Haluatko varmasti luottaa tähän avaimeen ehdottomasti? "
+
+#: g10/pkclist.c:313
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Varmennepolku ehdottomasti luotettuun julkiseen avaimeen:\n"
+
+#: g10/pkclist.c:387
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "Avain %08lX: avain on mitätöity!\n"
+
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
+msgid "Use this key anyway? "
+msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
+
+#: g10/pkclist.c:399
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "avain %08lX: aliavain on mitätöity!\n"
+
+#: g10/pkclist.c:420
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: avain on vanhentunut\n"
+
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
+"haltijalleen.\n"
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: Avaimeen EI luoteta\n"
+
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
+"haltijalleen.\n"
+
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
+
+#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "Tämä on oma avain\n"
+
+#: g10/pkclist.c:500
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+"Avaimen kuulumista nimetylle käyttäjätunnukselle EI voida varmistaa.\n"
+"Jos *todella*  tiedät mitä olet tekemässä, vastaa seuraavaan\n"
+"kysymykseen kyllä\n"
+"\n"
+
+#: g10/pkclist.c:514 g10/pkclist.c:544
+msgid "WARNING: Using untrusted key!\n"
+msgstr "VAROITUS: Käytettyyn avaimeen ei luoteta!\n"
+
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"VAROITUS: tämä avain saattaa olla mitätöity (mitätöintiavainta ei "
+"saatavilla)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
+
+#: g10/pkclist.c:563
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
+
+#: g10/pkclist.c:564
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
+
+#: g10/pkclist.c:570
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
+
+#: g10/pkclist.c:575
+msgid "Note: This key has been disabled.\n"
+msgstr "Huom: Tämä avain on poistettu käytöstä\n"
+
+#: g10/pkclist.c:580
+msgid "Note: This key has expired!\n"
+msgstr "Huom: Tämä avain on vanhentunut!\n"
+
+#: g10/pkclist.c:591
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr ""
+"VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"         Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
+"haltijalleen.\n"
+
+#: g10/pkclist.c:601
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
+
+#: g10/pkclist.c:602
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
+
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
+"allekirjoituksella!\n"
+
+#: g10/pkclist.c:612
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: ohitettu: %s\n"
+
+#: g10/pkclist.c:787 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
+
+#: g10/pkclist.c:829
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+"\n"
+"Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
+
+#: g10/pkclist.c:887
+msgid "No such user ID.\n"
+msgstr "Käyttäjätunnusta ei löydy.\n"
+
+#: g10/pkclist.c:892 g10/pkclist.c:954
+msgid "skipped: public key already set as default recipient\n"
+msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
+
+#: g10/pkclist.c:910
+msgid "Public key is disabled.\n"
+msgstr "Julkinen avain on poistettu käytöstä\n"
+
+#: g10/pkclist.c:917
+msgid "skipped: public key already set\n"
+msgstr "ohitettu: julkinen avain on jo asetettu\n"
+
+#: g10/pkclist.c:946
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
+#: g10/pkclist.c:991
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
+
+#: g10/pkclist.c:1046
+msgid "no valid addressees\n"
+msgstr "ei kelvollisia vastaanottajia\n"
+
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "valinta %c%lu on kopio\n"
+
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "liian monta \"%c\" valintaa\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "liian monta \"%c\" valintaa\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "liian monta \"%c\" valintaa\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "Valinnassa on luvaton merkki\n"
+
+#: g10/keygen.c:738
+msgid "writing direct signature\n"
+msgstr "kirjoitetaan suora allekirjoitus\n"
+
+#: g10/keygen.c:777
+msgid "writing self signature\n"
+msgstr "kirjoitetaan oma-allekirjoitus\n"
+
+#: g10/keygen.c:823
+msgid "writing key binding signature\n"
+msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
+
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
+
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "avaimen koko on pyöristetty %u bittiin\n"
+
+#: g10/keygen.c:1165
+msgid "Please select what kind of key you want:\n"
+msgstr "Valitse millaisen avaimen haluat:\n"
+
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA ja ElGamal (oletus)\n"
+
+#: g10/keygen.c:1168
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (vain allekirjoitus)\n"
+
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (vain salaus)\n"
+
+#: g10/keygen.c:1171
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (vain allekirjoitus)\n"
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (vain salaus)\n"
+
+#: g10/keygen.c:1175
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (salaus ja allekirjoitus)\n"
+
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+msgid "Your selection? "
+msgstr "Valintasi? "
+
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+msgid "Invalid selection.\n"
+msgstr "Valinta ei kelpaa.\n"
+
+#: g10/keygen.c:1225
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Luomassa uutta %s-avainparia.\n"
+"      pienin sallittu avainkoko on  768 bittiä\n"
+"                oletusavainkoko on 1024 bittiä\n"
+"  suurin suositeltava avainkoko on 2048 bittiä\n"
+
+#: g10/keygen.c:1234
+msgid "What keysize do you want? (1024) "
+msgstr "Minkä kokoisen avaimen haluat? (1024) "
+
+#: g10/keygen.c:1239
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA sallii avaimen koot vain väliltä 512-1024\n"
+
+#: g10/keygen.c:1241
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "avainkoko on liian pieni; RSA vaatii vähintään 1024.\n"
+
+#: g10/keygen.c:1244
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "avainkoko on liian pieni; pienin sallittu arvo on 768.\n"
+
+#: g10/keygen.c:1255
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "avainkoko on liian suuri; suurin sallittu arvo on %d.\n"
+
+#: g10/keygen.c:1260
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"2048 bittiä suurempia avaimia ei suositella, koska\n"
+"laskenta kestää TODELLA pitkään!\n"
+
+#: g10/keygen.c:1263
+msgid "Are you sure that you want this keysize? "
+msgstr "Haluatko varmasti tämän kokoisen avaimen? "
+
+#: g10/keygen.c:1264
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Hyvä on, mutta muista että näyttösi ja näppäimistösi säteily on myös "
+"alttiina salakuuntelulle!\n"
+
+#: g10/keygen.c:1273
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Halutun avaimen koko on %u bittiä\n"
+
+#: g10/keygen.c:1276 g10/keygen.c:1280
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "pyöristetty %u bittiin\n"
+
+#: g10/keygen.c:1331
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+"Kuinka kauan avaimen tulee olla voimassa.\n"
+"        0 = Avain ei vanhene koskaan\n"
+"     <n>  = Avain vanhenee n päivän kuluttua\n"
+"     <n>w = Avain vanhenee n viikon kuluttua\n"
+"     <n>m = Avain vanhenee n kuukauden kuluttua\n"
+"     <n>y = Avain vanhenee n vuoden kuluttua\n"
+
+#: g10/keygen.c:1340
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"Kuinka kauan allekirjoituksen tulee olla voimassa.\n"
+"        0 = Allekirjoitus ei vanhene koskaan\n"
+"     <n>  = Allekirjoitus vanhenee n päivän kuluttua\n"
+"     <n>w = Allekirjoitus vanhenee n viikon kuluttua\n"
+"     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
+"     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
+
+#: g10/keygen.c:1362
+msgid "Key is valid for? (0) "
+msgstr "Avain on voimassa? (0) "
+
+#: g10/keygen.c:1364
+msgid "Signature is valid for? (0) "
+msgstr "Allekirjoitus on voimassa? (0) "
+
+#: g10/keygen.c:1369
+msgid "invalid value\n"
+msgstr "arvo ei kelpaa\n"
+
+#: g10/keygen.c:1374
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr "%s ei vanhene koskaan\n"
+
+#: g10/keygen.c:1381
+#, c-format
+msgid "%s expires at %s\n"
+msgstr "%s vanhenee %s\n"
+
+#: g10/keygen.c:1387
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
+"Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
+
+#: g10/keygen.c:1392
+msgid "Is this correct (y/n)? "
+msgstr "Onko tämä oikein (k/e) "
+
+#: g10/keygen.c:1435
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"Tarviset käyttäjätunnuksen avaimesi tunnistamiseen; ohjelma muodostaa \n"
+"käyttäjätunnuksen oikeasta nimestä, huomautuksesta ja "
+"sähköpostiosoitteesta \n"
+"muodossa:\n"
+"     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
+"\n"
+
+#: g10/keygen.c:1447
+msgid "Real name: "
+msgstr "Oikea nimi: "
+
+#: g10/keygen.c:1455
+msgid "Invalid character in name\n"
+msgstr "Nimessä on epäkelpo merkki\n"
+
+#: g10/keygen.c:1457
+msgid "Name may not start with a digit\n"
+msgstr "Nimi ei voi alkaa numerolla\n"
+
+#: g10/keygen.c:1459
+msgid "Name must be at least 5 characters long\n"
+msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
+
+#: g10/keygen.c:1467
+msgid "Email address: "
+msgstr "Sähköpostiosoite: "
+
+#: g10/keygen.c:1478
+msgid "Not a valid email address\n"
+msgstr "Sähköpostiosoite ei kelpaa\n"
+
+#: g10/keygen.c:1486
+msgid "Comment: "
+msgstr "Huomautus: "
+
+#: g10/keygen.c:1492
+msgid "Invalid character in comment\n"
+msgstr "Huomautuksessa on epäkelpo merkki\n"
+
+#: g10/keygen.c:1515
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "Käytät merkistöä \"%s\".\n"
+
+#: g10/keygen.c:1521
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"Valitsit seuraavan käyttäjätunnuksen:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:1526
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
+
+#: g10/keygen.c:1531
+msgid "NnCcEeOoQq"
+msgstr "NnHhSsOoLl"
+
+#: g10/keygen.c:1541
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
+
+#: g10/keygen.c:1542
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
+
+#: g10/keygen.c:1561
+msgid "Please correct the error first\n"
+msgstr "Ole hyvä ja korjaa ensin virhe\n"
+
+#: g10/keygen.c:1600
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Tarvitset salasanan suojaamaan salaista avaintasi.\n"
+"\n"
+
+#: g10/keygen.c:1609 g10/keyedit.c:1021
+msgid "passphrase not correctly repeated; try again"
+msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
+
+#: g10/keygen.c:1610
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:1616
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway.  You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"Et halunnut salasanaa - tämä on luultavasti *huono* ajatus!\n"
+"Jatketaan silti.  Voit vaihtaa salasanaa milloin tahansa\n"
+"tämän ohjelman valitsimella \"--edit-key\".\n"
+"\n"
+
+#: g10/keygen.c:1638
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Tarvitaan paljon satunnaislukuja.  Voit suorittaa muita toimintoja\n"
+"(kirjoittaa näppäimistöllä, liikuttaa hiirtä, käyttää levyjä)\n"
+"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
+"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "valitan, tätä ei voi tehdä eräajossa\n"
+
+#: g10/keygen.c:2267
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "DSA-avainparissa on 1024 bittiä.\n"
+
+#: g10/keygen.c:2335
+msgid "Key generation canceled.\n"
+msgstr "Avaimen luonti keskeytetty.\n"
+
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: g10/keygen.c:2565
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
+
+#: g10/keygen.c:2571
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
+
+#: g10/keygen.c:2589
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
+
+#: g10/keygen.c:2596
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
+
+#: g10/keygen.c:2619
+msgid "public and secret key created and signed.\n"
+msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
+
+#: g10/keygen.c:2630
+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 ""
+"Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
+"\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
+
+#: g10/keygen.c:2642 g10/keygen.c:2755
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Avaimen luonti epäonnistui: %s\n"
+
+#: g10/keygen.c:2691 g10/sign.c:290
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
+"kellon kanssa on ongelmia)\n"
+
+#: g10/keygen.c:2693 g10/sign.c:292
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
+"kellon kanssa on ongelmia)\n"
+
+#: g10/keygen.c:2702
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
+
+#: g10/keygen.c:2730
+msgid "Really create? "
+msgstr "Haluatko varmasti luoda? "
+
+#: g10/decrypt.c:98 g10/encode.c:845
+msgid "--output doesn't work for this command\n"
+msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
+
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: ei voida avata kohdetta: %s\n"
+
+#: g10/encode.c:203 g10/sign.c:1144
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: g10/encode.c:208
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
+
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "käytetään salakirjoitusalgoritmia %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "\"%s\" on jo pakattu\n"
+
+#: g10/encode.c:301 g10/encode.c:590
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: VAROITUS: tiedosto on tyhjä\n"
+
+#: g10/encode.c:465
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr ""
+"--pgp2-tilassa voidaan salata korkeintaan 2048-bittisillä RSA-avaimilla\n"
+
+#: g10/encode.c:480
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "luetaan kohteesta \"%s\"\n"
+
+#: g10/encode.c:516
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr "kaikille salattaville avaimille ei voi käyttää IDEA-salainta.\n"
+
+#: g10/encode.c:526 g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
+
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
+
+#: g10/encode.c:818
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
+
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "avainta \"%s\" ei löydy: %s\n"
+
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "virhe luettaessa avainlohkoa: %s\n"
+
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "avain %08lX: ei suojattu - ohitetaan\n"
+
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
+
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+"VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-"
+"tarkistussummaa\n"
+
+#: g10/export.c:385
+msgid "WARNING: nothing exported\n"
+msgstr "VAROITUS: mitään ei viety\n"
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
+
+#: g10/getkey.c:186 g10/getkey.c:2693
+msgid "[User id not found]"
+msgstr "[Käyttäjätunnusta ei löytynyt]"
+
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+"Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr ""
+"käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr ""
+"avain %08lX: salaisella avaimella ei ole vastaavaa \n"
+"julkista avainta - ohitetaan\n"
+
+#: g10/import.c:241
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "ohitetaan tyypin %d lohko\n"
+
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "tähän mennessä käsitelty %lu avainta\n"
+
+#: g10/import.c:255
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: g10/import.c:267
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Kaikkiaan käsitelty: %lu\n"
+
+#: g10/import.c:269
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "      ohitetaan uudet avaimet: %lu\n"
+
+#: g10/import.c:272
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "          ilman käyttäjätunnuksia: %lu\n"
+
+#: g10/import.c:274
+#, c-format
+msgid "              imported: %lu"
+msgstr "              tuotu: %lu"
+
+#: g10/import.c:280
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "             muuttamatonta: %lu\n"
+
+#: g10/import.c:282
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "          uusia käyttäjätunnuksia: %lu\n"
+
+#: g10/import.c:284
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "           uusia aliavaimia: %lu\n"
+
+#: g10/import.c:286
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "        uusia allekirjoituksia: %lu\n"
+
+#: g10/import.c:288
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "   uusia avainten mitätöintejä: %lu\n"
+
+#: g10/import.c:290
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "      luettuja salaisia avaimia: %lu\n"
+
+#: g10/import.c:292
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "  tuotuja salaisia avaimia: %lu\n"
+
+#: g10/import.c:294
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " muuttamattomia salaisia avaimia: %lu\n"
+
+#: g10/import.c:296
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr "          ei tuotu: %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "avain %08lX: ei käyttäjätunnusta\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr ""
+"avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "avain %08lX: uusi avain - ohitetaan\n"
+
+#: g10/import.c:755
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
+
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
+
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
+
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
+
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
+
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
+
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
+
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
+
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "avain %08lX: \"%s\" ei muutoksia\n"
+
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
+
+#: g10/import.c:1064
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
+
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "avain %08lX: salainen avain tuotu\n"
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "avain %08lX: avain on jo avainrenkaassa\n"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
+
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr ""
+"avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
+
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
+
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
+
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
+
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
+
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
+
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
+
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
+
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
+
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
+
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
+
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
+
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
+
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "avain %08lX: käyttäjätunnus ohitettu '"
+
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "avain %08lX: aliavain ohitettu\n"
+
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr ""
+"avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
+
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
+
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
+
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
+
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr ""
+"VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
+
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr ""
+"VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
+"ei saatavilla.\n"
+
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
+
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
+
+#: g10/keyedit.c:159
+msgid "[revocation]"
+msgstr "[mitätöinti]"
+
+#: g10/keyedit.c:160
+msgid "[self-signature]"
+msgstr "[oma-allekirjoitus]"
+
+#: g10/keyedit.c:237 g10/keylist.c:319
+msgid "1 bad signature\n"
+msgstr "1 väärä allekirjoitus\n"
+
+#: g10/keyedit.c:239 g10/keylist.c:321
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d väärää allekirjoitusta\n"
+
+#: g10/keyedit.c:241 g10/keylist.c:323
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
+
+#: g10/keyedit.c:243 g10/keylist.c:325
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
+
+#: g10/keyedit.c:245 g10/keylist.c:327
+msgid "1 signature not checked due to an error\n"
+msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
+
+#: g10/keyedit.c:247 g10/keylist.c:329
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
+
+#: g10/keyedit.c:249
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
+
+#: g10/keyedit.c:251
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr ""
+"havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Luotan osittain\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Luotan täysin\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "Käyttäjätunnus \"%s\" on mitätöity."
+
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
+
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
+msgid "  Unable to sign.\n"
+msgstr "  Allekirjoittaminen ei onnistu.\n"
+
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
+
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
+
+#: g10/keyedit.c:584
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Oma-allekirjoitus kohteessa \"%s\"\n"
+"on PGP 2.x -muodon allekirjoitus.\n"
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr ""
+"Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
+"(k/E) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
+"on vanhentunut.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
+
+#: g10/keyedit.c:632
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
+"on paikallinen allekirjoitus.\n"
+
+#: g10/keyedit.c:636
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+"Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
+
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
+
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
+
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
+
+#: g10/keyedit.c:702
+msgid "This key has expired!"
+msgstr "Tämä avain on vanhentunut!"
+
+#: g10/keyedit.c:722
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "Avain vanhenee %s.\n"
+
+#: g10/keyedit.c:726
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
+
+#: g10/keyedit.c:759
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
+
+#: g10/keyedit.c:761
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
+
+#: g10/keyedit.c:786
+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 ""
+"Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
+"Jos et tiedä vastausta, syötä \"0\".\n"
+
+#: g10/keyedit.c:791
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr "   (0) En vastaa.%s\n"
+
+#: g10/keyedit.c:793
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
+
+#: g10/keyedit.c:795
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
+
+#: g10/keyedit.c:797
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
+
+#: g10/keyedit.c:826
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Haluatko varmasti allekirjoittaa tämän avaimen\n"
+"omalla avaimellasi: \""
+
+#: g10/keyedit.c:835
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"\n"
+"Tämä tulee olemaan oma-allekirjoitus.\n"
+
+#: g10/keyedit.c:839
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
+
+#: g10/keyedit.c:844
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
+
+#: g10/keyedit.c:851
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
+
+#: g10/keyedit.c:855
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
+
+#: g10/keyedit.c:860
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+"\n"
+"En ole tarkistanut tätä avainta lainkaan.\n"
+
+#: g10/keyedit.c:864
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+"\n"
+"Olen tarkistanut avaimen arkisesti.\n"
+
+#: g10/keyedit.c:868
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+"\n"
+"Olen tarkistanut avaimen erittäin huolellisesti.\n"
+
+#: g10/keyedit.c:877
+msgid "Really sign? "
+msgstr "Varmastiko allekirjoita? "
+
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "allekirjoitus epäonnistui: %s\n"
+
+#: g10/keyedit.c:978
+msgid "This key is not protected.\n"
+msgstr "Avainta ei ole suojattu.\n"
+
+#: g10/keyedit.c:982
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
+
+#: g10/keyedit.c:986
+msgid "Key is protected.\n"
+msgstr "Avain on suojattu.\n"
+
+#: g10/keyedit.c:1006
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Ei voi muokata avainta: %s\n"
+
+#: g10/keyedit.c:1012
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Syötä uusi salasana salaiselle avaimelle.\n"
+"\n"
+
+#: g10/keyedit.c:1026
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
+"\n"
+
+#: g10/keyedit.c:1029
+msgid "Do you really want to do this? "
+msgstr "Haluatko varmasti tehdä tämän? "
+
+#: g10/keyedit.c:1095
+msgid "moving a key signature to the correct place\n"
+msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
+
+#: g10/keyedit.c:1138
+msgid "quit this menu"
+msgstr "ulos tästä valikosta"
+
+#: g10/keyedit.c:1139
+msgid "q"
+msgstr "q"
+
+#: g10/keyedit.c:1140
+msgid "save"
+msgstr "tallenna"
+
+#: g10/keyedit.c:1140
+msgid "save and quit"
+msgstr "tallenna ja lopeta"
+
+#: g10/keyedit.c:1141
+msgid "help"
+msgstr "apua"
+
+#: g10/keyedit.c:1141
+msgid "show this help"
+msgstr "näytä tämä ohje"
+
+#: g10/keyedit.c:1143
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:1143
+msgid "show fingerprint"
+msgstr "näytä sormenjälki"
+
+#: g10/keyedit.c:1144
+msgid "list"
+msgstr "list"
+
+#: g10/keyedit.c:1144
+msgid "list key and user IDs"
+msgstr "näytä avaimet ja käyttäjätunnukset"
+
+#: g10/keyedit.c:1145
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:1146
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:1146
+msgid "select user ID N"
+msgstr "valitse käyttäjätunnus N"
+
+#: g10/keyedit.c:1147
+msgid "key"
+msgstr "key"
+
+#: g10/keyedit.c:1147
+msgid "select secondary key N"
+msgstr "valitse toissijainen avain N"
+
+#: g10/keyedit.c:1148
+msgid "check"
+msgstr "check"
+
+#: g10/keyedit.c:1148
+msgid "list signatures"
+msgstr "näytä allekirjoitukset"
+
+#: g10/keyedit.c:1149
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:1150
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:1150
+msgid "sign the key"
+msgstr "allekirjoita avain"
+
+#: g10/keyedit.c:1151
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "tee erillinen allekirjoitus"
+
+#: g10/keyedit.c:1153
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:1153
+msgid "sign the key locally"
+msgstr "allekirjoita avain paikallisesti"
+
+#: g10/keyedit.c:1154
+msgid "nrsign"
+msgstr "nrsign"
+
+#: g10/keyedit.c:1154
+msgid "sign the key non-revocably"
+msgstr "allekirjoita avain mitätöimättömästi"
+
+#: g10/keyedit.c:1155
+msgid "nrlsign"
+msgstr "nrlsign"
+
+#: g10/keyedit.c:1155
+msgid "sign the key locally and non-revocably"
+msgstr "allekirjoita avain paikallisesti ja mitätöimättömästi"
+
+#: g10/keyedit.c:1156
+msgid "debug"
+msgstr "debug"
+
+#: g10/keyedit.c:1157
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:1157
+msgid "add a user ID"
+msgstr "lisää käyttäjätunnus"
+
+#: g10/keyedit.c:1158
+msgid "addphoto"
+msgstr "addphoto"
+
+#: g10/keyedit.c:1158
+msgid "add a photo ID"
+msgstr "lisää valokuva"
+
+#: g10/keyedit.c:1159
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:1159
+msgid "delete user ID"
+msgstr "poista käyttäjätunnus"
+
+#: g10/keyedit.c:1161
+msgid "delphoto"
+msgstr "delphoto"
+
+#: g10/keyedit.c:1162
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1162
+msgid "add a secondary key"
+msgstr "lisää toissijainen avain"
+
+#: g10/keyedit.c:1163
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:1163
+msgid "delete a secondary key"
+msgstr "poista toissijainen avain"
+
+#: g10/keyedit.c:1164
+msgid "addrevoker"
+msgstr "addrevoker"
+
+#: g10/keyedit.c:1164
+msgid "add a revocation key"
+msgstr "lisää mitätöintiavain"
+
+#: g10/keyedit.c:1165
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:1165
+msgid "delete signatures"
+msgstr "poista allekirjoitus"
+
+#: g10/keyedit.c:1166
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:1166
+msgid "change the expire date"
+msgstr "muuta voimassoloaikaa"
+
+#: g10/keyedit.c:1167
+msgid "primary"
+msgstr "primary"
+
+#: g10/keyedit.c:1167
+msgid "flag user ID as primary"
+msgstr "merkitse käyttäjätunnus ensisijaiseksi"
+
+#: g10/keyedit.c:1168
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:1168
+msgid "toggle between secret and public key listing"
+msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
+
+#: g10/keyedit.c:1170
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:1171
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:1171
+msgid "list preferences (expert)"
+msgstr "näytä valinnat (asiantuntija)"
+
+#: g10/keyedit.c:1172
+msgid "showpref"
+msgstr "showpref"
+
+#: g10/keyedit.c:1172
+msgid "list preferences (verbose)"
+msgstr "näytä valinnat (monisanaisesti)"
+
+#: g10/keyedit.c:1173
+msgid "setpref"
+msgstr "setpref"
+
+#: g10/keyedit.c:1173
+msgid "set preference list"
+msgstr "näytä valinnat"
+
+#: g10/keyedit.c:1174
+msgid "updpref"
+msgstr "updpref"
+
+#: g10/keyedit.c:1174
+msgid "updated preferences"
+msgstr "päivitä valinnat"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "avainpalvelinvirhe"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
+
+#: g10/keyedit.c:1176
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:1176
+msgid "change the passphrase"
+msgstr "muuta salasanaa"
+
+#: g10/keyedit.c:1177
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:1177
+msgid "change the ownertrust"
+msgstr "muuta luottamusastetta"
+
+#: g10/keyedit.c:1178
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:1178
+msgid "revoke signatures"
+msgstr "mitätöi allekirjoitus"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "mitätöi käyttäjätunnus"
+
+#: g10/keyedit.c:1180
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:1180
+msgid "revoke a secondary key"
+msgstr "mitätöi toissijainen avain"
+
+#: g10/keyedit.c:1181
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:1181
+msgid "disable a key"
+msgstr "poista avain käytöstä"
+
+#: g10/keyedit.c:1182
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:1182
+msgid "enable a key"
+msgstr "ota avain käyttöön"
+
+#: g10/keyedit.c:1183
+msgid "showphoto"
+msgstr "showphoto"
+
+#: g10/keyedit.c:1183
+msgid "show photo ID"
+msgstr "näytä valokuvatunniste"
+
+#: g10/keyedit.c:1202 g10/delkey.c:120
+msgid "can't do that in batchmode\n"
+msgstr "tätä ei voi tehdä eräajossa\n"
+
+#: g10/keyedit.c:1233
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
+
+#: g10/keyedit.c:1250
+msgid "Secret key is available.\n"
+msgstr "Salainen avain on saatavilla.\n"
+
+#: g10/keyedit.c:1282
+msgid "Command> "
+msgstr "Komento> "
+
+#: g10/keyedit.c:1312
+msgid "Need the secret key to do this.\n"
+msgstr "Tähän tarvitaan salainen avain.\n"
+
+#: g10/keyedit.c:1316
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "Käytä ensin komentoa \"toggle\".\n"
+
+#: g10/keyedit.c:1364
+msgid "Key is revoked."
+msgstr "Avain on mitätöity."
+
+#: g10/keyedit.c:1383
+msgid "Really sign all user IDs? "
+msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
+
+#: g10/keyedit.c:1384
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
+
+#: g10/keyedit.c:1409
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
+
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+msgid "You must select at least one user ID.\n"
+msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
+
+#: g10/keyedit.c:1433
+msgid "You can't delete the last user ID!\n"
+msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
+
+#: g10/keyedit.c:1436
+msgid "Really remove all selected user IDs? "
+msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
+
+#: g10/keyedit.c:1437
+msgid "Really remove this user ID? "
+msgstr "Varmastiko poista tämä käyttäjätunnus? "
+
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
+msgid "You must select at least one key.\n"
+msgstr "Sinun täytyy valita ainakin yksi avain.\n"
+
+#: g10/keyedit.c:1478
+msgid "Do you really want to delete the selected keys? "
+msgstr "Haluatko varmasti poistaa valitut avaimet? "
+
+#: g10/keyedit.c:1479
+msgid "Do you really want to delete this key? "
+msgstr "Haluatko varmasti poistaa tämän avaimen? "
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
+
+#: g10/keyedit.c:1534
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
+
+#: g10/keyedit.c:1535
+msgid "Do you really want to revoke this key? "
+msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "näytä valinnat"
+
+#: g10/keyedit.c:1612
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
+
+#: g10/keyedit.c:1614
+msgid "Really update the preferences? "
+msgstr "Varmastiko päivitä valinnat? "
+
+#: g10/keyedit.c:1662
+msgid "Save changes? "
+msgstr "Tallenna muutokset? "
+
+#: g10/keyedit.c:1665
+msgid "Quit without saving? "
+msgstr "Lopeta tallentamatta muutoksia?"
+
+#: g10/keyedit.c:1675
+#, c-format
+msgid "update failed: %s\n"
+msgstr "päivitys epäonnistui: %s\n"
+
+#: g10/keyedit.c:1682
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "salaisen päivitys epäonnistui: %s\n"
+
+#: g10/keyedit.c:1689
+msgid "Key not changed so no update needed.\n"
+msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
+
+#: g10/keyedit.c:1701
+msgid "Invalid command  (try \"help\")\n"
+msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Tiiviste: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Ominaisuudet: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr " (luottamuksellinen)"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "ei voida luoda kohdetta %s: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[mitätöity] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [vanhenee: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [vanhenee: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " luottamus: %c/%c"
+
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
+msgid "This key has been disabled"
+msgstr "Tämä avain on poistettu käytöstä"
+
+#: g10/keyedit.c:2146
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! aliavain on mitätöity: %s\n"
+
+#: g10/keyedit.c:2149
+msgid "rev- faked revocation found\n"
+msgstr "rev- väärennetty mitätöinti löydetty\n"
+
+#: g10/keyedit.c:2151
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[mitätöity] "
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
+
+#: g10/keyedit.c:2207
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
+"ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[mitätöity] "
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[vanhentunut] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
+"komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
+
+#: g10/keyedit.c:2399
+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 ""
+"VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
+"          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
+
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
+
+#: g10/keyedit.c:2410
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
+
+#: g10/keyedit.c:2545
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
+
+#: g10/keyedit.c:2555
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
+
+#: g10/keyedit.c:2559
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
+
+#: g10/keyedit.c:2565
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
+
+#: g10/keyedit.c:2579
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d allekirjoitus poistettu.\n"
+
+#: g10/keyedit.c:2580
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d allekirjoitusta poistettu.\n"
+
+#: g10/keyedit.c:2583
+msgid "Nothing deleted.\n"
+msgstr "Mitään ei poistettu.\n"
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"VAROITUS: Tämä on PGP 2.x -muodon avain.  Määrätyn mitätöijän lisääminen "
+"voi\n"
+"          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
+
+#: g10/keyedit.c:2703
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
+
+#: g10/keyedit.c:2726
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
+
+#: g10/keyedit.c:2741
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
+
+#: g10/keyedit.c:2849
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Poista salaisten avainten valinnat, kiitos.\n"
+
+#: g10/keyedit.c:2855
+msgid "Please select at most one secondary key.\n"
+msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
+
+#: g10/keyedit.c:2859
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
+
+#: g10/keyedit.c:2862
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
+
+#: g10/keyedit.c:2908
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
+
+#: g10/keyedit.c:2924
+msgid "No corresponding signature in secret ring\n"
+msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
+
+#: g10/keyedit.c:3004
+msgid "Please select exactly one user ID.\n"
+msgstr "Valitse tasan yksi käyttäjätunnus!\n"
+
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
+
+#: g10/keyedit.c:3377
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "Indeksillä %d ei löydy toissijaista avainta\n"
+
+#: g10/keyedit.c:3491
+msgid "user ID: \""
+msgstr "käyttäjätunnus: \""
+
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"allekirjoitettu avaimellasi %08lX %s\n"
+
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"allekirjoitettu paikallisesti avaimellasi %08lX %s\n"
+
+#: g10/keyedit.c:3504
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "Tämä allekirjoitus vanheni %s.\n"
+
+#: g10/keyedit.c:3508
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
+
+#: g10/keyedit.c:3512
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
+
+#: g10/keyedit.c:3537
+msgid "You have signed these user IDs:\n"
+msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
+
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
+
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   %08lX mitätöi tämän %s\n"
+
+#: g10/keyedit.c:3587
+msgid "You are about to revoke these signatures:\n"
+msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
+
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr "   %08lX allekirjoitti tämän %s%s\n"
+
+#: g10/keyedit.c:3599
+msgid " (non-exportable)"
+msgstr " (vientiin kelpaamaton)"
+
+#: g10/keyedit.c:3606
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
+
+#: g10/keyedit.c:3636
+msgid "no secret key\n"
+msgstr "salainen avain ei ole saatavilla\n"
+
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+"VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
+"tulevaisuuteen\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr ""
+"Näytetään valokuva %s, kokoa %ld avaimelle 0x%08lX\n"
+"(käyttäjätunnus %d)\n"
+
+#: g10/keylist.c:179
+msgid "Critical signature policy: "
+msgstr "Kriittinen allekirjoituskäytäntö: "
+
+#: g10/keylist.c:181
+msgid "Signature policy: "
+msgstr "Allekirjoituskäytäntö: "
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
+msgid "WARNING: invalid notation data found\n"
+msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
+
+#: g10/keylist.c:286
+msgid "Critical signature notation: "
+msgstr "Kriittinen allekirjoitusnotaatio: "
+
+#: g10/keylist.c:288
+msgid "Signature notation: "
+msgstr "Allekirjoitusnotaatio: "
+
+#: g10/keylist.c:299
+msgid "not human readable"
+msgstr "ei ihmisten luettavissa"
+
+#: g10/keylist.c:400
+msgid "Keyring"
+msgstr "Avainrengas"
+
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [vanhenee: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
+msgid " [expires: %s]"
+msgstr " [vanhenee: %s]"
+
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[mitätöity] "
+
+#: g10/keylist.c:1357
+msgid "Primary key fingerprint:"
+msgstr "Ensisijaisen avaimen sormenjälki:"
+
+#: g10/keylist.c:1359
+msgid "     Subkey fingerprint:"
+msgstr "     Aliavaimen sormenjälki:"
+
+#: g10/keylist.c:1366
+msgid " Primary key fingerprint:"
+msgstr " Ensisijaisen avaimen sormenjälki:"
+
+#: g10/keylist.c:1368
+msgid "      Subkey fingerprint:"
+msgstr "      Aliavaimen sormenjälki:"
+
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr "     Avaimen sormenjälki ="
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
+
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "väärä salasana tai tuntematon salausalgoritmi (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s-salattu istuntoavain\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s salattua dataa\n"
+
+#: g10/mainproc.c:305 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "salattu tuntemattomalla algoritmilla %d\n"
+
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "salattu tuntemattomalla algoritmilla %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "julkinen avain on %08lX\n"
+
+#: g10/mainproc.c:428
+msgid "public key encrypted data: good DEK\n"
+msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
+
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
+
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "salattu %s-avaimella, tunnus %08lX\n"
+
+#: g10/mainproc.c:486
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "julkisen avaimen avaus epäonnistui: %s\n"
+
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "salattu %lu salasanalla\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "salattu yhdellä salasanalla\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "oletettavasti %s-salattua dataa\n"
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr ""
+"IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
+"käyttää sen sijaan salainta %s\n"
+
+#: g10/mainproc.c:570
+msgid "decryption okay\n"
+msgstr "avaus onnistui\n"
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
+
+#: g10/mainproc.c:587
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "VAROITUS: salattua viestiä on muokattu!\n"
+
+#: g10/mainproc.c:593
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "avaus epäonnistui: %s\n"
+
+#: g10/mainproc.c:613
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
+
+#: g10/mainproc.c:615
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
+
+#: g10/mainproc.c:787
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
+
+#: g10/mainproc.c:1283
+msgid "signature verification suppressed\n"
+msgstr "allekirjoituksen varmistus vaiennetaan\n"
+
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
+msgid "can't handle these multiple signatures\n"
+msgstr "näitä allekirjoituksia ei voi käsitellä\n"
+
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Allekirjoitus vanheni %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                aka \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr ""
+"Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Avain saatavilla kohteessa: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
+msgid "Expired signature from \""
+msgstr "Vanhentunut allekirjoitus lähettäjältä \""
+
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
+msgid "Good signature from \""
+msgstr "Allekirjoitus täsmää lähettäjään \""
+
+#: g10/mainproc.c:1510
+msgid "[uncertain]"
+msgstr "[ei tiedossa]"
+
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                aka \""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Allekirjoitus vanheni %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Allekirjoitus vanhenee %s\n"
+
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binääri"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "teksti"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "tuntematon "
+
+#: g10/mainproc.c:1668
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
+
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
+msgid "not a detached signature\n"
+msgstr "allekirjoitus ei ole erillinen\n"
+
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
+"tarkistaa.\n"
+
+#: g10/mainproc.c:1787
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
+
+#: g10/mainproc.c:1844
+msgid "old style (PGP 2.x) signature\n"
+msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
+
+#: g10/mainproc.c:1854
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
+
+#: g10/misc.c:82
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "core-tiedostojen luontia ei voi estää: %s\n"
+
+#: g10/misc.c:146
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Kokeellisia algoritmeja ei pitäisi käyttää!\n"
+
+#: g10/misc.c:176
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+"tämän salausalgoritmin käyttöä paheksutaan; ole hyvä ja käytä "
+"standardimpaa!\n"
+
+#: g10/misc.c:282
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
+
+#: g10/misc.c:283
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr "lue lisätietoja osoitteesta http://www.gnupg.org/why-not-idea.html\n"
+
+#: g10/misc.c:491
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
+
+#: g10/misc.c:495
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
+#: g10/misc.c:497
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "pakkaamaton"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "pakkaamaton"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "luetaan asetukset tiedostosta \"%s\"\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
+#: g10/parse-packet.c:120
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
+
+#: g10/parse-packet.c:1128
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
+
+#: g10/passphrase.c:461 g10/passphrase.c:508
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
+
+#: g10/passphrase.c:469
+msgid "can't set client pid for the agent\n"
+msgstr "agentille ei voida asettaa pid:tä\n"
+
+#: g10/passphrase.c:477
+msgid "can't get server read FD for the agent\n"
+msgstr "palvelin ei lue agentin FD:tä\n"
+
+#: g10/passphrase.c:484
+msgid "can't get server write FD for the agent\n"
+msgstr "palvelin ei kirjoita agentille FD:tä\n"
+
+#: g10/passphrase.c:517
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
+
+#: g10/passphrase.c:530
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
+
+#: g10/passphrase.c:551
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
+
+#: g10/passphrase.c:573
+msgid "communication problem with gpg-agent\n"
+msgstr "gpg-agentin kanssa yhteysongelma\n"
+
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+msgid "problem with the agent - disabling agent use\n"
+msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
+
+#: g10/passphrase.c:681
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (pääavaimen tunnus %08lX)"
+
+#: g10/passphrase.c:691
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle:\n"
+"\"%.*s\"\n"
+"%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
+
+#: g10/passphrase.c:713
+msgid "Repeat passphrase\n"
+msgstr "Toista salasana\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Syötä salasana\n"
+
+#: g10/passphrase.c:753
+msgid "passphrase too long\n"
+msgstr "salasana on liian pitkä\n"
+
+#: g10/passphrase.c:766
+msgid "invalid response from agent\n"
+msgstr "agentin lähettämä vastaus ei kelpaa\n"
+
+#: g10/passphrase.c:781 g10/passphrase.c:874
+msgid "cancelled by user\n"
+msgstr "käyttäjän peruma\n"
+
+#: g10/passphrase.c:786 g10/passphrase.c:963
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "salasanan kysyminen ei onnistu eräajossa\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Syötä salasana: "
+
+#: g10/passphrase.c:1131
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
+
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
+
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (pääavaimen tunnus %08lX)"
+
+#: g10/passphrase.c:1213
+msgid "Repeat passphrase: "
+msgstr "Toista salasana: "
+
+#: g10/plaintext.c:90
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr ""
+"dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
+
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "virhe luotaessa \"%s\": %s\n"
+
+#: g10/plaintext.c:438
+msgid "Detached signature.\n"
+msgstr "Erillinen allekirjoitus.\n"
+
+#: g10/plaintext.c:442
+msgid "Please enter name of data file: "
+msgstr "Anna datatiedoston nimi: "
+
+#: g10/plaintext.c:463
+msgid "reading stdin ...\n"
+msgstr "luetaan vakiosyötettä ...\n"
+
+#: g10/plaintext.c:497
+msgid "no signed data\n"
+msgstr "ei allekirjoitettua dataa\n"
+
+#: g10/plaintext.c:505
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
+
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "nimetön vastaanottaja; yritän käyttää salaista avainta %08lX ...\n"
+
+#: g10/pubkey-enc.c:119
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "ok, nimetön vastaanottaja olet sinä.\n"
+
+#: g10/pubkey-enc.c:207
+msgid "old encoding of the DEK is not supported\n"
+msgstr "vanhaa DEK-koodaus ei tueta\n"
+
+#: g10/pubkey-enc.c:228
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
+
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
+
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "HUOM: salainen avain %08lX vanheni %s\n"
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "HUOM: avain on mitätöity!"
+
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
+
+#: g10/seckey-cert.c:60
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+
+#: g10/seckey-cert.c:250
+msgid "Invalid passphrase; please try again"
+msgstr "Salasana ei kelpaa; yritä uudestaan"
+
+#: g10/seckey-cert.c:251
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:311
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "VAROITUS: Havaittiin heikko avain -  vaihda salasanaa uudestaan.\n"
+
+#: g10/seckey-cert.c:349
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+"luodaan paheksuttava 16-bittinen tarkistussumma salaisen avaimen suojaksi\n"
+
+#: g10/sig-check.c:75
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "VAROITUS: allekirjoitustiiviste ei täsmää viestin kanssa\n"
+
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr ""
+"VAROITUS: allekirjoitusaliavaimella %08lX on epäkelpo ristiinvarmennus\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
+
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
+
+#: g10/sig-check.c:180
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
+"kellon kanssa on ongelmia)\n"
+
+#: g10/sig-check.c:182
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
+"kellon kanssa on ongelmia)\n"
+
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
+
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"Epäkelpo allekirjoitus avaimelta %08lX oletettavasti johtuen tuntemattomasta "
+"\"critical bit\":istä\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "avain %08lX: ei vastaavaa aliavainta aliavaimen mitätöintipaketille\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "avain %08lX: ei aliavainta aliavaimen liitosallekirjoitukselle\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"notaatiodataa ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+"notaatiodataa ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -tyyliset)\n"
+
+#: g10/sign.c:112
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"VAROITUS: %%-laajennus ei onnistu (liian suuri).  Käytetään "
+"laajentamatonta.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"käytäntö-URL:ia ei voi laittaa v3-allekirjoituksiin (PGP 2.x -tyyliset)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"käytäntö-URL:ia ei voi laittaa v3-avainallekirjoituksiin (PGP 2.x -"
+"tyyliset)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
+"Käytetään laajentamatonta.\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
+"Käytetään laajentamatonta.\n"
+
+#: g10/sign.c:364
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
+
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
+
+#: g10/sign.c:550
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
+
+#: g10/sign.c:741
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
+"vain --pgp2-tilassa\n"
+
+#: g10/sign.c:765 g10/sign.c:1001
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "ei voida luoda kohdetta %s: %s\n"
+
+#: g10/sign.c:794
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
+
+#: g10/sign.c:886
+msgid "signing:"
+msgstr "allekirjoitetaan:"
+
+#: g10/sign.c:985
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
+"vain --pgp2-tilassa\n"
+
+#: g10/sign.c:1138
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "käytetään %s-salausta\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "syöterivi on yli %d merkkiä pitkä\n"
+
+#: g10/tdbio.c:128 g10/tdbio.c:1434
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
+
+#: g10/tdbio.c:134 g10/tdbio.c:1441
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr "trustdb-tapahtuma on liian suuri\n"
+
+#: g10/tdbio.c:497
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: kohteeseen ei päästä: %s\n"
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: hakemistoa ei ole olemassa!\n"
+
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: ei voi luoda lukitusta\n"
+
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: ei voi tehdä lukkoa\n"
+
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: ei voi luoda: %s\n"
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: versiotietueen luonti epäonnistui: %s"
+
+#: g10/tdbio.c:549
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: luotu trustdb ei kelpaa\n"
+
+#: g10/tdbio.c:552
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb luotu\n"
+
+#: g10/tdbio.c:592
+msgid "NOTE: trustdb not writable\n"
+msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
+
+#: g10/tdbio.c:608
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: trustdb ei kelpaa\n"
+
+#: g10/tdbio.c:640
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
+
+#: g10/tdbio.c:648
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
+
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
+
+#: g10/tdbio.c:1163
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek epäonnistui: %s\n"
+
+#: g10/tdbio.c:1171
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
+
+#: g10/tdbio.c:1192
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: ei ole trustdb-tiedosto\n"
+
+#: g10/tdbio.c:1210
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: versiotietue tietuenumerolla %lu\n"
+
+#: g10/tdbio.c:1215
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: tiedostoversio %d ei kelpaa\n"
+
+#: g10/tdbio.c:1400
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
+
+#: g10/tdbio.c:1408
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
+
+#: g10/tdbio.c:1418
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
+
+#: g10/tdbio.c:1448
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
+
+#: g10/tdbio.c:1493
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n"
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
+
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
+
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
+
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr ""
+"avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
+
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
+
+#: g10/trustdb.c:344
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
+
+#: g10/trustdb.c:350
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
+
+#: g10/trustdb.c:365 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
+
+#: g10/trustdb.c:380 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: synkronointi epäonnistui: %s\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "ei koskaan"
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
+msgid "no need for a trustdb check\n"
+msgstr "trustdb:n tarkistusta ei tarvita\n"
+
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "seuraava trustdb tarkistus %s\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "trustdb:n tarkistusta ei tarvita\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "trustdb:n tarkistusta ei tarvita\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "julkista avainta %08lX ei löydy: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "tee --check-trustdb, kiitos\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "tarkistetaan trustdb:tä\n"
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
+
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"allekirjoitusta ei voi varmistaa.\n"
+"Muista, että allekirjoitustiedosto (.sig tai .asc)\n"
+"tulee antaa komentorivillä ensimmäisenä.\n"
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "syöterivi %u on liian pitkä tai rivinvaihto puutuu\n"
+
+#: 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 ""
+"avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
+"satunnaislukugeneraattorin kanssa!\n"
+
+#: g10/skclist.c:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "ohitetaan \"%s\": kopio\n"
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "ohitetaan \"%s\": %s\n"
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr "ohitetaan: salainen avain on jo paikalla\n"
+
+#: g10/skclist.c:179
+#, fuzzy, c-format
+msgid ""
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
+"allekirjoittaa turvallisesti!\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "Tiedosto \"%s\" on olemassa."
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Ylikirjoita (k/E)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: tuntematon pääte\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Syötä uusi tiedostonimi"
+
+#: g10/openfile.c:183
+msgid "writing to stdout\n"
+msgstr "kirjoitetaan vakiotulosteeseen\n"
+
+#: g10/openfile.c:282
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
+
+#: g10/openfile.c:349
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "uusi asetustiedosto \"%s\" luotu\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
+"ajossa\n"
+
+#: g10/openfile.c:380
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: hakemistoa ei voi luoda: %s\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: hakemisto luotu\n"
+
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
+"esiintyvällä heikolla avaimella.\n"
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr "ongelma käsiteltäessä salattua pakettia\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "luotu avain on heikko - yritän uudestaan\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr ""
+"heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n"
+"yritettiin %d kertaa!\n"
+
+#: g10/seskey.c:210
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n"
+
+#: g10/delkey.c:121 g10/delkey.c:128
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
+
+#: g10/delkey.c:127
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "ei onnistu eräajossa ilman \"--yes\"-valitsinta\n"
+
+#: g10/delkey.c:139
+msgid "Delete this key from the keyring? "
+msgstr "Poista tämä avain avainrenkaasta? "
+
+#: g10/delkey.c:147
+msgid "This is a secret key! - really delete? "
+msgstr "Tämä on salainen avain! - poista varmasti? "
+
+#: g10/delkey.c:157
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: g10/delkey.c:167
+msgid "ownertrust information cleared\n"
+msgstr "luottamustiedot pyyhitty\n"
+
+#: g10/delkey.c:195
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
+
+#: g10/delkey.c:197
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
+
+#: g10/helptext.c:48
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Tämän arvon määrittäminen on sinun tehtäväsi, tätä arvoa ei koskaan \n"
+"kerrota kolmansille osapuolille. Tarvitsemme sitä toteuttamaan \n"
+"luottamusverkko eikä sillä ei ole mitään tekemistä (epäsuorasti luotujen) \n"
+"varmenneverkkojen kanssa."
+
+#: g10/helptext.c:54
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"Rakentaakseen luottamusverkon, GnuPG:n täytyy tietää mihin avaimiin \n"
+"luotetaan ehdottomasti - nämä ovat tavallisesti ne avaimet, joiden "
+"salainen \n"
+"pari on sinulla.  Vastaa \"kyllä\" luottaaksesi tähän avaimeen ehdoitta\n"
+
+#: g10/helptext.c:61
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr ""
+"Vastaa \"kyllä\" jos haluat kaikesta huolimatta käyttää tätä mitätöityä "
+"avainta."
+
+#: g10/helptext.c:65
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+"Vastaa \"kyllä\" jos haluat kaikesta huolimatta käyttää tätä epäluotettavaa\n"
+"avainta."
+
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Syötä vastaanottajan, jolle haluat lähettää viestin, käyttäjätunnus."
+
+#: g10/helptext.c:73
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+
+#: g10/helptext.c:87
+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 ""
+"Yleensä ei ole järkevää käyttää samaa avainta allekirjoitukseen\n"
+"ja salaamiseen. Tätä algorimiä tulisi käyttää vain määrätyissä "
+"ympäristöissä.\n"
+"Ole hyvä ja kysy tietoturva-asiantuntijaltasi ensin"
+
+#: g10/helptext.c:94
+msgid "Enter the size of the key"
+msgstr "Syötä avaimen koko"
+
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
+msgid "Answer \"yes\" or \"no\""
+msgstr "Vastaa \"kyllä\" tai \" ei\""
+
+#: g10/helptext.c:108
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Syötä pyydetty arvo kuten näkyy kehotteessa.\n"
+"On mahdollista syöttää ISO-muotoinen päivä (VVVV-KK-PP),\n"
+"mutta sen seurauksena et saa kunnollista virheilmoitusta \n"
+"vaan järjestelmä yrittää tulkita arvon aikajaksona."
+
+#: g10/helptext.c:120
+msgid "Enter the name of the key holder"
+msgstr "Anna avaimen haltijan nimi"
+
+#: g10/helptext.c:125
+msgid "please enter an optional but highly suggested email address"
+msgstr "anna vapaaehtoinen, mutta erittäin suositeltava sähköpostiosoite"
+
+#: g10/helptext.c:129
+msgid "Please enter an optional comment"
+msgstr "Kirjoita vapaaehtoinen huomautus"
+
+#: g10/helptext.c:134
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N   muuta nimeä\n"
+"C   muuta kommenttia\n"
+"E   muuta sähköpostiosoitetta\n"
+"O   jatka avaimen luomista\n"
+"L   lopeta"
+
+#: g10/helptext.c:143
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "Vastaa \"kyllä\" (tai vain \"k\") jos haluat luoda aliavaimen."
+
+#: g10/helptext.c:151
+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"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"Allekirjoittaessasi avaimen käyttäjätunnuksen sinun tulisi varmista, että \n"
+"avain todella kuuluu henkilölle, joka mainitaan käyttäjätunnuksessa.  "
+"Muiden \n"
+"on hyvä tietää kuinka huolellisesti olet varmistanut tämän. \n"
+"\n"
+"\"0\" tarkoittaa, että et väitä mitään siitä, kuinka huolellisesti olet\n"
+"    varmistanut avaimen.\n"
+"\n"
+"\"1\" tarkoittaa, että uskot avaimen kuuluvan henkilölle, joka väittää \n"
+"    hallitsevan sitä, mutta et voinut varmistaa tai et varmistanut avainta \n"
+"    lainkaan.  Tämä on hyödyllinen \"persoonan\" varmistamiseen, jossa \n"
+"    allekirjoitat pseudonyymin käyttäjän avaimen.\n"
+"\n"
+"\"2\" tarkoittaa arkista varmistusta.  Esimerkiksi olet varmistanut \n"
+"    avaimen sormenjäljen ja tarkistanut käyttäjätunnuksen ja \n"
+"    valokuvatunnisteen täsmäävän.\n"
+"\n"
+"\"3\" tarkoittaa syvällistä henkilöllisyyden varmistamista.  Esimerkiksi \n"
+"    tämä voi tarkoittaa avaimen sormenjäljen tarkistamista avaimen "
+"haltijan \n"
+"    kanssa henkilökohtaisesti, ja että tarkistit nimen avaimessa täsmäävän \n"
+"    vaikeasti väärennettävän kuvallisen henkilöllisyystodistuksen (kuten \n"
+"    passi) kanssa, ja lopuksi varmistit (sähköpostin vaihtamisella), että \n"
+"    sähköpostiosoite kuuluu avaimen haltijalle.\n"
+"\n"
+"Huomaa, että yllä annetut esimerkit tasoille 2 ja 3 ovat todellakin *vain* \n"
+"esimerkkejä.  Lopullisesti se on sinun päätöksesi mitä \"arkinen\" ja \n"
+"\"syvällinen\" tarkoittaa allekirjoittaessasi muita avaimia.\n"
+"\n"
+"Jos et tiedä mikä olisi sopiva vastaus, vastaa \"0\"."
+
+#: g10/helptext.c:189
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "Vastaa \"kyllä\" jos haluat allekirjoittaa KAIKKI käyttäjätunnukset"
+
+#: g10/helptext.c:193
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Vastaa \"kyllä\", jos haluat poistaa tämän käyttäjätunnuksen.\n"
+"Menetät samalla kaikki siihen liittyvät varmenteet!"
+
+#: g10/helptext.c:198
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Vastaa \"kyllä\", jos aliavaimen voi poistaa"
+
+#: g10/helptext.c:203
+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 ""
+"Tämä on voimassa oleva allekirjoitus tälle avaimelle, tavallisesti ei \n"
+"kannata poistaa tätä allekirjoitusta koska se saattaa olla tarpeen\n"
+"luottamussuhteen luomiseksi avaimeen tai johonkin toiseen tämän avaimen\n"
+"varmentamaan avaimeen."
+
+#: g10/helptext.c:208
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"Allekirjoitusta ei voida tarkistaa koska sinulla ei ole \n"
+"siihen liittyvää avainta. Lykkää sen poistamista kunnes\n"
+" tiedät mitä avainta on käytetty, koska allekirjoitus \n"
+"avain saattaa luoda luottamusketjun toisen, jo ennalta \n"
+"varmennetun avaimen kautta."
+
+#: g10/helptext.c:214
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+"Allekirjoitus ei ole pätevä.  Järkevintä olisi poistaa se \n"
+"avainrenkaastasi."
+
+#: g10/helptext.c:218
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"Tämä allekirjoitus takaa avaimen haltijan henkilöllisyyden. \n"
+"Tällaisen allekirjoituksen poistaminen on tavallisesti huono \n"
+"ajatus.  GnuPG ei kenties voi käyttää avainta enää.  Poista \n"
+"allekirjoitus vain, jos se ei ole jostain syystä pätevä, ja \n"
+"avaimella on jo toinen allekirjoitus."
+
+#: g10/helptext.c:226
+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 ""
+"Muuta valinnat kaikille käyttäjätunnuksille (tai vain valituille)\n"
+"nykyiseen luetteloon valinnoista.  Kaikkien muutettujen\n"
+"oma-allekirjoitusten aikaleima siirretään yhdellä sekunnilla eteenpäin.\n"
+
+#: g10/helptext.c:233
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
+
+#: g10/helptext.c:239
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "Toista edellinen salasanasi varmistuaksesi siitä, mitä kirjoitit."
+
+#: g10/helptext.c:243
+msgid "Give the name of the file to which the signature applies"
+msgstr "Anna allekirjoitetun tiedoston nimi"
+
+#: g10/helptext.c:248
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Vastaa \"kyllä\", jos tiedoston voi ylikirjoittaa"
+
+#: g10/helptext.c:253
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"Syötä uusi tiedostonimi. Jos painat vain RETURN, käytetään\n"
+"oletustiedostoa (joka näkyy sulkeissa)."
+
+#: g10/helptext.c:259
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"Sinun tulisi määrittää syy varmenteelle. Riippuen asiayhteydestä\n"
+"voit valita tästä listasta:\n"
+"  \"Avain on paljastunut\"\n"
+"      Käytä tätä, jos sinulla on syytä uskoa, että luvattomat henkilöt \n"
+"      ovat saaneet salaisen avaimesi käsiinsä.\n"
+"  \"Avain on korvattu\"\n"
+"      Käytä tätä, jos olet korvannut tämän uudemmalla avaimella.\n"
+"  \"Avain ei ole enää käytössä\"\n"
+"      Käytä tätä, jost ole lopettanut tämän avaimen käytön.\n"
+"  \"Käyttäjätunnus ei ole enää voimassa\"\n"
+"      Käytä tätä ilmoittamaan, että käyttäjätunnusta ei pitäisi käyttää;\n"
+"      tätä normaalisti käytetään merkitsemään sähköpostiosoite "
+"vanhenneeksi.\n"
+
+#: g10/helptext.c:275
+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 ""
+"Halutessasi voit kirjoittaa tähän kuvauksen miksi julkaiset tämän\n"
+"mitätöintivarmenteen.  Kirjoita lyhyesti.\n"
+"Tyhjä rivi päättää tekstin.\n"
+
+#: g10/helptext.c:290
+msgid "No help available"
+msgstr "Ei ohjeita saatavilla"
+
+#: g10/helptext.c:298
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Ei ohjetta aiheesta \"%s\""
+
+#: g10/keydb.c:189
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#: g10/keydb.c:196
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "avainrengas \"%s\" luotu\n"
+
+#: g10/keydb.c:615
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
+
+#: g10/keyring.c:1236
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s säilyi muuttumattomana\n"
+
+#: g10/keyring.c:1239
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s on uusi\n"
+
+#: g10/keyring.c:1240
+msgid "Please fix this possible security flaw\n"
+msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
+
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "tarkistetaan avainrengasta \"%s\"\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: avainrengas luotu\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Valitse kuva, jota haluat käyttää valokuvatunnisteenasi.  Kuvan täytyy "
+"olla \n"
+"JPEG-tiedosto.  Muista, että kuva tallennetaan julkiseen avaimeesi.  Jos \n"
+"käytät erittäin suurta kuvaa, myös avaimesta tulee erittäin suuri!\n"
+"Kuvan koon ollessa suunnilleen 240x288, on koko sopiva käyttöön.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Valokuvaa \"%s\" ei voi avata: %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Haluatko varmasti käyttää sitä (k/E)? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" ei ole JPEG-tiedosto\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Onko tämä oikein (k/E/l)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "valokuvatunnistetta ei voi näyttää!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "etäohjelman suorittamista ei tueta\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"ulkoisen ohjelman kutsuminen poistettu käytöstä johtuen turvattomista \n"
+"asetustiedoston oikeuksista\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"tämä ympäristö vaatii väliaikaistiedoston kutsuttaessa ulkoisia ohjelmia\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "järjestelmävirhe kutsuttaessa ulkoista ohjelmaa: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "ulkoisen ohjelman luonnoton päättyminen\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "ulkoista ohjelmaa ei voi suorittaa\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "ulkoisen ohjelman vastausta ei voi lukea: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "ei koskaan"
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet epäonnistui: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "avain %08lX: ei käyttäjätunnusta\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Mitätöinnin tekee:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Luo tälle avaimelle mitätöintivarmenne? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII-koodattu tuloste määritetty.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet epäonnistui: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Mitätöintivarmenne luotu.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "salaista avainta \"%s\" ei löydy: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "ei vastaavaa julkista avainta: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "tuntematon suojausalgoritmi\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Mitätöintivarmenne luotu.\n"
+"\n"
+"Ole hyvä ja siirrä se medialle, jonka voit piilottaa; jos Mallory saa \n"
+"käsiinsä tämän varmenteen, hän voi tehdä sillä avaimesta "
+"käyttökelvottoman. \n"
+"On järkevää tulostaa tämä varmenne ja tallentaa se siltä varalta, että \n"
+"mediastasi tulee lukukelvoton.  Mutta varoituksen sanana: Tietokoneesi \n"
+"tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
+"saataville!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Valitse mitätöinnin syy:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Peru"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Todennäköisesti haluat valita %d tässä)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Mitätöinnin syy: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Kuvausta ei annettu)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Kelpaako tämä? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Luettelo annettuista luottamusarvoista, luotu %s\n"
+"# (Käytä \"gpg --import-ownertrust\" palauttaaksesi ne)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "ei voi avata tiedostoa: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "rivi on liian pitkä\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "virhe: kaksoispiste puuttuu\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "virhe: sormenjälki on väärä\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "virhe: ei luottamusarvoa\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "virhe etsittäessä luottamustietuetta: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "lukuvirhe: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "VAROITUS: tiiviste \"%s\" ei ole osa OpenPGP:tä.  Käytä omalla "
+#~ "vastuullasi!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[tiedostot]|salaa tiedostot"
+
+#~ msgid "store only"
+#~ msgstr "vain tallennus"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[tiedostot]|avaa tiedostot"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "allekirjoita avain mitätöimättömästi"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "allekirjoita avain paikallisesti ja mitätöimättömästi"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "luettele vain sarja paketteja"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "vie luottamusasteet"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "tuo luottamusasteet"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "automaattinen luottamustietokannan päivitys"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "korjaa turmeltunut luottamustietokanta"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Pura ascii-koodaus tiedostosta tai vakiosyötteestä"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Ascii-koodaa tekstitiedosto tai vakiosyöte"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "käytä oletusavainta oletusvastaanottajana"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "älä käytä lainkaan päätettä"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "käytä aina v3-allekirjoituksia"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "älä käytä aina v3-allekirjoituksia"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "käytä aina v4-allekirjoituksia"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "älä käytä aina v3-allekirjoituksia"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "käytä aina MDC:tä salaamiseen"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "älä koskaan käytä MDC:tä salaamiseen"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "käytä gpg-agentia"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "eräajo: älä kysy mitään"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "lisää tämä salainen avainrengas luetteloon"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
+
+#~ msgid "read options from file"
+#~ msgstr "lue asetukset tiedostosta"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[tiedosto]|kirjoita tilatiedot tiedostoon"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|AVAIN_ID|luota ehdottomasti tähän avaimeen"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "jäljittele RFC1991:ssä kuvattua toimintamuotoa"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "aseta kaikki paketti-, salain- ja tiivistevaihtoehdot OpenPGP-muotoon"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "aseta kaikki paketti-, salain- ja tiivistevaihtoehdot PGP 2.x -muotoon"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|käytä salasanoissa toimintatapaa N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NIMI|käytä salasanoihin viestintiivistealgoritmia NIMI"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NIMI|käytä salausalgoritmia NIMI"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|käytä pakkausalgoritmia N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "jätä avaintunnistekenttä pois salatuista paketeista"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Näytä valokuvatunnisteet"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Älä näytä valokuvatunnisteita"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Aseta valokuvatunnisteiden katsomiskomento"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "pakkausalgoritmin täytyy olla väliltä %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Ei ole varmaa, että tämä avain todella kuuluu haltijalleen, "
+#~ "mutta \n"
+#~ "avain hyväksytään siitä huolimatta\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "valinta %c%lu ei ole pätevä\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "avain %08lX: ei ole rfc2440-avain - ohitetaan\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "HUOM: Elgamal-ensisijainen avain havaittu - tämän tuominen voi kestää "
+#~ "hetken\n"
+
+#~ msgid " (default)"
+#~ msgstr " (oletusarvo)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX luotu: %s vanhenee: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Notaatio: "
+
+#~ msgid "Policy: "
+#~ msgstr "Käytäntö: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "pyydetään avainta %08lX kohteesta %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "avainpalvelimelta ei saa avainta: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "kohteeseen \"%s\" lähettäminen onnistui (tila=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "virhe lähettäessä kohteeseen \"%s\": tila=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "tämä avainpalvelin ei tue valitsinta --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr " avainpalvelimelta ei pysty etsimään: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "avain %08lX: tämä on PGP:n luoma ElGamal-avain, jota EI ole turvallista \n"
+#~ "käyttää allekirjoituksiin!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "avain %08lX on luotu %lu sekuntia tulevaisuudessa (on tapahtunu aikahyppy "
+#~ "tai\n"
+#~ "kellon kanssa on ongelmia\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "avain %08lX on luotu %lu sekuntia tulevaisuudessa (on tapahtunut "
+#~ "aikahyppy tai\n"
+#~ "kellon kanssa on ongelmia)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "avain %08lX on määritelty ehdottoman luotettavaksi:\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr ""
+#~ "allekirjoitus Elgamal-allekirjoitusavaimella %08lX avaimelle %08lX "
+#~ "ohitettu\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr ""
+#~ "allekirjoitus avaimelta %08lX Elgamal-allekirjoitusavaimelle %08lX "
+#~ "ohitettu\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "tarkistetaan syvyyteen %d allekirjoitettu=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%"
+#~ "d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Valitse käytettävä algoritmi.\n"
+#~ "\n"
+#~ "DSA (eli DSS) on digitaalinen allekirjoitusalgoritmi, jota voidaan \n"
+#~ "käyttää vain allekirjoituksiin.  DSA:ta suositellaan, koska sillä "
+#~ "tuotetut \n"
+#~ "allekirjoitukset voidaan varmistaa paljon nopeammin verrattuna ElGamal:"
+#~ "iin.\n"
+#~ "\n"
+#~ "ElGamal-algoritmia voidaan käyttää sekä allekirjoituksiin että \n"
+#~ "salaamiseen.  OpenPGP erottaa seuraavat kaksi toimintatapaa toisistaan:\n"
+#~ "pelkkä allekirjoitus ja allekirjoitus+salaus.  Toimintatavat ovat\n"
+#~ "itseasiassa samanlaiset, mutta joitakin parametrejä täytyy valita "
+#~ "erityisellä\n"
+#~ "tavalla luotaessa turvallista allekirjoitusavainta.  Tämä ohjelma "
+#~ "pystyy \n"
+#~ "siihen, mutta toiset OpenPGP-sovellukset eivät välttämättä pysty \n"
+#~ "tulkitsemaan allekirjoitus+salaus-muotoa.\n"
+#~ "\n"
+#~ "Ensisijainen avain täytyy aina olla allekirjoittamiseen sopiva avain; \n"
+#~ "tämä on syy, miksi vain salaus-ElGamal-avain ei ole tässä valittavissa \n"
+#~ "tässä valikossa."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Vaikka nämä avaintyypit on määritelty RFC2440:ssa, niitä ei \n"
+#~ "suositella, koska kaikki ohjelmat eivät tue niitä, ja niillä \n"
+#~ "tuotetut allekirjoitukset ovat melko suuria ja näin ollen hitaita \n"
+#~ "tarkistaa."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "tähän mennessä käsitelty %lu avainta (%lu allekirjoitusta)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "avain vaillinainen\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "avain %08lX on vaillinainen\n"
diff --git a/po/fr.po b/po/fr.po
index 709c670e9..3abfbf72d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 # GnuPG French translation
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998-2003 Free Software Foundation, Inc.
 # Ga�l Qu�ri <[email protected]>, 1998.
 #
 # Thanks to R�mi Guyomarch <[email protected]> and <[email protected]>
@@ -9,58 +9,75 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-06-24 02:06+02:00\n"
+"Project-Id-Version: gnupg 1.2.5\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-16 20:20+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "Avertissement: l'utilisation de la m�moire n'est pas s�re !\n"
+msgstr "AVERTISSEMENT: l'utilisation de la m�moire n'est pas s�re !\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'op�ration n'est pas possible tant que la m�moire s�re n'est pas\n"
 "initialis�e\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "oO"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "non"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "quitter"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "erreur g�n�rale"
@@ -257,7 +274,6 @@ msgstr "non chiffr�"
 msgid "not processed"
 msgstr "non trait�"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "cl� publique inutilisable"
@@ -270,76 +286,83 @@ msgstr "cl� secr�te inutilisable"
 msgid "keyserver error"
 msgstr "erreur du serveur de cl�s"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... c'est un bug (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
-"avertissement: la taille du fichier `random_seed' est invalide.\n"
+"AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilis�.\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'�crire `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -364,7 +387,34 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+"l'algorithme de hachage `%s' ne marche que pour la lecture dans cette\n"
+"version\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Attendez s'il vous pla�t que l'entropie soit r�cup�r�e. Vous pouvez\n"
+"faire autre chose pour ne pas vous ennuyer, car cela donnera une\n"
+"meilleure qualit� � l'entropie.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -372,163 +422,128 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "[fichier]|chiffrer les fichiers"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "pas d'action"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[fichiers]|d�chiffrer les fichiers"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "signer une cl� irr�vocablement"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "signer une cl� localement et irr�vocablement"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "ne lister que les paquets"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "exporter les indices de confiance"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importer les indices de confiance"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "mise � jour inattendue de la base de confiance"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "r�parer une base de confiance corrompue"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "Enlever l'armure d'un fichier ou de stdin"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "Mettre une armure � un fichier ou � stdin"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -538,202 +553,55 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "utiliser la cl� par d�f. comme r�cipient"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "devenir beaucoup plus silencieux"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "ne pas utiliser du tout le terminal"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "forcer les signatures en v3"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "ne pas forcer les signatures en v3"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "forcer les signatures en v4"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "ne pas forcer les signatures en v4"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "toujours utiliser un sceau pour le chiffrement"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr ""
-"ne jamais utiliser de sceau pour le\n"
-"chiffrement"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "utiliser gpg-agent"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "mode automatique: ne jamais rien demander"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "r�pondre oui � la plupart des questions"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "r�pondre non � la plupart des questions"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "ajouter ce porte-cl�s � la liste"
+msgstr "demander avant d'�craser un fichier"
 
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "ajouter ce porte-cl�s secret � la liste"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "indiquer o� est une cl� list�e"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOM|le terminal utilise la table de caract�res NOM"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "lire les options du fichier"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|�crire l'�tat sur ce descripteur"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[fichier]|�crire les informations d'�tat vers ce fichier"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|IDCL�|donner une confiance ultime � cette cl�"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FICH|charger le module d'extension FICH"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "imiter le mode d�crit dans la RFC1991"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "utiliser le comportement d�fini par OpenPGP"
-
-#: g10/g10.c:443
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#: g10/g10.c:507
+msgid "use strict OpenPGP 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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|coder les mots de passe suivant le mode N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOM|utiliser la fonction de hachage NOM"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|utiliser l'algorithme de compression N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "supprimer l'ident. des paquets chiffr�s"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Montrer les photos d'identit�"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "Ne pas montrer les photos d'identit�"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
-"Choisir la ligne de commande servant �\n"
-"afficher les photos d'identit�"
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -741,7 +609,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -761,17 +629,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -781,7 +649,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:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -789,452 +657,676 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Cl� publique: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Chiffrement: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hachage: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Compression: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
+msgstr "no = signature trouv�e dans la d�finition du groupe \"%s\"\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr ""
+"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
+"s�r pour %s \"%s\"\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1193
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "Attention: propri�taire de %s \"%s\" peu s�r\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr ""
+"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
+"s�r pour %s \"%s\"\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1196
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "Attention: permissions de %s \"%s\" peu s�res\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr ""
+"AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
+"s�r pour %s \"%s\"\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1202
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "Attention: propri�taire de %s \"%s\" peu s�r\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr ""
+"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
+"sont peu s�res\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1205
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "Attention: permissions de %s \"%s\" peu s�res\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr ""
+"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
+"sont peu s�res\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1208
 #, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr ""
+"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
+"sont peu s�res\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "�l�ment de configuration \"%s\" inconnu\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
+msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, 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:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, 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:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
+"l'extension de chiffrement \"%s\" n'a pas �t� charg�e car ses\n"
+"permissions sont peu s�res\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, 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:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: version %d du fichier invalide\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "options d'export invalides\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: options d'import invalides\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "armure invalide"
+msgstr "options d'import invalides\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: version %d du fichier invalide\n"
+msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "porte-cl�s invalide"
+msgstr "options d'export invalides\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: options d'import invalides\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "options d'import invalides\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: options d'export invalides\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "options d'export invalides\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, 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:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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:1737
+#: g10/g10.c:2441
 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:1743
+#: g10/g10.c:2447
 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:1756
+#: g10/g10.c:2460
 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:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "ce message ne sera pas forc�ment utilisable par PGP 2.x\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "la fonction de hachage s�lectionn�e est invalide\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1845
-#, 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:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
+
+#: g10/g10.c:2572
 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:1858
+#: g10/g10.c:2576
 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:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "pr�f�rences invalides\n"
+msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "pr�f�rences invalides\n"
+msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "pr�f�rences invalides\n"
+msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "pr�f�rences invalides\n"
+msgstr "pr�f�rences de compression personnelles invalides\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s ne marche pas encore avec %s\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"vous ne pouvez pas utiliser l'algorithme de chiffrement \"%s\"\n"
+"en mode %s.\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"vous ne pouvez pas utiliser l'algorithme de hachage \"%s\"\n"
+"en mode %s.\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"vous ne pouvez pas utiliser l'algorithme de compression \"%s\"\n"
+"en mode %s.\n"
+
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"AVERTISSEMENT: des r�cipients (-r) ont donn�s alors que le chiffrement\n"
+"ne se fait pas par cl� publique\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [nom du fichier]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [nom du fichier]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "l'export de la cl� a �chou�: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"le nom d'une notation ne doit comporter que des caract�res imprimables\n"
+"ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
+
+#: g10/g10.c:3678
 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:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 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
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "l'URL de politique de signature donn�e est invalide\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "devenir beaucoup plus silencieux"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "enlever les cl�s de ce porte-cl�s"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr ""
+"faire en sorte que les conflits d'horodatage ne soient qu'un\n"
+"avertissement non fatal"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|�crire l'�tat sur ce descripteur"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Utilisation: gpgv [options] [fichiers] (-h pour l'aide)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Syntaxe: gpg [options] [fichiers]\n"
+"Verifier des signatures avec des cl�s de confiance connues\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "en-t�te d'armure: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "armure inattendue:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caract�re %02x invalide en base 64 ignor�\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Erreur de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "Aucune raison sp�cifi�e"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "La cl� a �t� remplac�e"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "La cl� a �t� compromise"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "La cl� n'est plus utilis�e"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "Cause de r�vocation: "
+msgstr "cause de r�vocation: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Commentaire de r�vocation: "
+msgstr "commentaire de r�vocation: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Pas de confiance d�finie pour :\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "              alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "              alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1245,193 +1337,213 @@ msgstr ""
 "des cl�s des autres utilisateurs (vous pouvez v�rifier son passeport,\n"
 "v�rifier les empreintes de diverses sources...) ?\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = ne sait pas\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = je ne fais PAS confiance\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = je crois marginalement\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = je fais enti�rement confiance\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = je donne une confiance ultime\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = donnez-moi plus d'informations\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = retour au menu principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = sauter cette cl�\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = quitter\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Voulez-vous vraiment donner une confiance ultime � cette cl� ?"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une cl� � confiance ultime:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "cl� %08lX: la cl� a �t� r�voqu�e !\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Utiliser cette cl� quand m�me ? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "cl� %08lX: la sous-cl� a �t� r�voqu�e !\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: la cl� a expir�\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Rien ne dit que la cl� appartient vraiment au propri�taire.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Nous ne faisons PAS confiance � cette cl�\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
-msgstr ""
-"%08lX: Il n'est pas s�r que cette cl� appartient vraiment � son\n"
-"propri�taire mais elle est quand m�me accept�e\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "%08lX: Rien ne dit que la cl� appartient vraiment au propri�taire.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Cette cl� appartient probablement � son propri�taire\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"Il n'est pas certain que la cl� appartient � sos propri�taire.\n"
+"Il n'est PAS certain que la cl� appartient � sos propri�taire.\n"
 "Si vous savez *vraiment* ce que vous faites, vous pouvez r�pondre\n"
 "oui � la prochaine question\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION: Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"AVERTISSEMENT: cette cl� est peut-�tre r�voqu�e (cl� de r�vocation\n"
+"absente)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "           Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette sous-cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: cette cl� a �t� d�sactiv�e.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Note: Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "           Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION: Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1439,135 +1551,129 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 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:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "r�cipient par d�faut `%s' inconnu\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: 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:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "pr�f�rence %c%lu dupliqu�e\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "trop de pr�f�rences `%c'\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
 msgstr "trop de pr�f�rences `%c'\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "trop de pr�f�rences `%c'\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
 msgstr "Caract�re invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:524
-#, fuzzy
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "�criture de l'auto-signature\n"
+msgstr "�criture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par d�faut)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (signature et chiffrement)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (signature et chiffrement)\n"
+msgstr "   (%d) RSA (signature et chiffrement)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1580,36 +1686,28 @@ msgstr ""
 "          la taille par d�faut est 1024 bits\n"
 " la taille maximale conseill�e est 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 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:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1617,11 +1715,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:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous s�r de vouloir cette taille ? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1629,17 +1727,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1655,7 +1753,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1671,30 +1769,29 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "La signature est valide pour ? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expire le %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1702,11 +1799,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1722,44 +1819,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 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:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1770,28 +1867,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1799,16 +1896,16 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1820,7 +1917,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1832,55 +1929,60 @@ 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:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "d�sol�, impossible de faire cela en mode automatique\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "�criture de la cl� secr�te vers `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, 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:2211
+#: g10/keygen.c:2571
 #, 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:2225
+#: g10/keygen.c:2589
 #, 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:2232
+#: g10/keygen.c:2596
 #, 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:2252
+#: g10/keygen.c:2619
 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:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "cl� marqu�e comme ayant une confiance ultime.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1889,13 +1991,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, 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:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1903,7 +2005,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:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1911,616 +2013,707 @@ 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:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossible d'ouvrir: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
+"il n'est pas possible d'utiliser un paquet ESK sym�trique en mode S2K\n"
+
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
+"avec les pr�ferences du r�cipient\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, 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:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Cette commande n'est pas admise en mode %s.\n"
+"forcer l'algorithme de compression %s (%d) entre en d�saccord\n"
+"avec les pr�f�rences du r�cipient\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s chiffr� pour: %s\n"
+msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "cl� '%s' introuvable: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/export.c:222
-#, 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:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %08lX: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+"AVERTISSEMENT: la cl� secr�te %08lX n'a pas de somme de contr�le SK\n"
+"simple\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %08lX a �t� rendue valide par --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "pas de sous-cl� secr�te pour la cl� publique %08lX - ignor�e\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la cl� secondaire %08lX � la place de la cl�\n"
 "principale %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "                      import�e: %lu"
+msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "cl� %08lX: pas de nom d'utilisateur\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/import.c:597
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/import.c:612
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "cl� %08lX: nom d'utilisateur non auto-sign� accept� '%s':\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "cl� %08lX: pas de nom d'utilisateur\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "cl� %08lX: corruption de sous-cl� HKP r�par�e\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "cl� %08lX: nom d'utilisateur non auto-sign� accept� '%s':\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, 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:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "cl� %08lX: cl� publique import�e\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "cl� %08lX: cl� publique \"%s\" import�e\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %08lX: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %08lX: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "cl� %08lX: un nouvel utilisateur\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "cl� %08lX: \"%s\" un nouvel utilisateur\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "cl� %08lX: %d nouveaux utilisateurs\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "cl� %08lX: \"%s\" %d nouveaux utilisateurs\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "cl� %08lX: une nouvelle signature\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "cl� %08lX: \"%s\" une nouvelle signature\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "cl� %08lX: %d nouvelles signatures\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "cl� %08lX: \"%s\" %d nouvelles signatures\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "cl� %08lX: une nouvelle sous-cl�\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "cl� %08lX: \"%s\" une nouvelle sous-cl�\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "cl� %08lX: \"%s\" %d nouvelles sous-cl�s\n"
+
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "cl� %08lX: %d nouvelles sous-cl�s\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "cl� %08lX: \"%s\" n'a pas chang�\n"
 
-#: g10/import.c:774
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "cl� %08lX: n'a pas chang�\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr ""
+"cl� %08lX: cl� secr�te avec le chiffrement invalide %d - non prise\n"
+"en compte\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "cl� %08lX: cl� secr�te import�e\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "cl� %08lX: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %08lX: cl� secr�te pas trouv�e: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %08lX: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "cl� %08lX: certificat de r�vocation import�\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "cl� %08lX: \"%s\" certificat de r�vocation import�\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
-"cl� %08lX: algorithme de cl� publique non support� sur le nom\n"
+"cl� %08lX: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur \"%s\"\n"
 
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "cl� %08lX: auto-signature sur le nom d'utilisateur \"%s\" invalide\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "cl� %08lX: auto-signature du nom d'utilisateur \"%s\" invalide\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "cl� %08lX: supressions de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "cl� %08lX: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "cl� %08lX: r�vocation de sous-cl� invalide\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "cl� %08lX: suppression de la r�vocation de sous-cl� multiples\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "cl� %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "cl� %08lX: sous-cl� non prise en compte\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "cl� %08lX: signature non exportable (classe %02x) - ignor�e\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %08lX: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %08lX: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "cl� %08lX: certificat de r�vocation au mauvais endroit - ignor�e\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "cl� %08lX: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "cl� %08lX: classe de signature non attendue (0x%02X) - ignor�e\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1698
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"Attention: la cl� %08lX est peut-�tre r�voqu�e: recherche de la cl� de\n"
+"AVERTISSEMENT: la cl� %08lX est peut-�tre r�voqu�e: recherche de la cl� de\n"
 "r�vocation %08lX\n"
 
-#: g10/import.c:1403
+#: g10/import.c:1711
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"Attention: la cl� %08lX est peut-�tre r�voqu�e: la cl� de r�vocation\n"
+"AVERTISSEMENT: la cl� %08lX est peut-�tre r�voqu�e: la cl� de r�vocation\n"
 "%08lX est absente.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "cl�: %08lX: \"%s\" certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "cl� %08lX: ajout de la signature de cl� directe\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 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:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 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:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, 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:231
+#: g10/keyedit.c:249
 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:233
+#: g10/keyedit.c:251
 #, 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:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = je crois marginalement\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = je fais enti�rement confiance\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Etes-vous sur de toujours vouloir le signer ? (o/N) "
+msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
+
+#: g10/keyedit.c:584
+#, 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"
+"L'auto-signature de \"%s\"\n"
+"est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
+msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Votre signature actuelle de \"%s\"\n"
+"a expir�.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
+"expir� ? (o/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
-"Votre signature actuelle sur \"%s\"\n"
+"Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 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:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
-"il n'est pas possible de g�n�rer une signature OpenPGP sur une cl� de style\n"
+"il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2530,27 +2723,31 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, 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:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, 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:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2558,32 +2755,32 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "cela peut provenir d'une auto-signature manquante\n"
+msgstr ""
+"\n"
+"cela sera une auto-signature.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"La signature sera marqu�e comme non-exportable.\n"
+"AVERTISSEMENT: la signature ne sera pas marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 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"
+"AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
+"non-r�vocable.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2591,7 +2788,7 @@ msgstr ""
 "\n"
 "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2599,7 +2796,7 @@ msgstr ""
 "\n"
 "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2607,7 +2804,7 @@ msgstr ""
 "\n"
 "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2615,7 +2812,7 @@ msgstr ""
 "\n"
 "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2623,39 +2820,40 @@ msgstr ""
 "\n"
 "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 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:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 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:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2664,471 +2862,572 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "signer"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "faire une signature d�tach�e"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsigner"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "signer la cl� de fa�on non-r�vocable"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsigner"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "signer la cl� de fa�on locale et non-r�vocable"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "aj.photo"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "suppr.photo"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "aj.cl�"
+msgstr "aj.rev"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "ajouter une cl� secondaire"
+msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "principale"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 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:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "montr.pr�f"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "mettre.pr�f"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "donner la liste de pr�f�rences"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "pr�f.m�j"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "pr�f�rences mises � jour"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "erreur du serveur de cl�s"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "r�voquer un nom d'utilisateur"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revcl�"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "d�sactiver"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "activer une cl�"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "montr.photo"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "montrer la photo d'identit�"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, 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:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, 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:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "R�voquer r�ellement ce nom d'utilisateur ? "
+
+#: g10/keyedit.c:1534
 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:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "donner la liste de pr�f�rences"
+
+#: g10/keyedit.c:1612
 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:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 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:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Hachage: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Fonctions: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, 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"
+msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "impossible de cr�er %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revoqu�e] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [expire: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [expire: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, 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:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, 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:1837
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revoqu�e] "
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
+"Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
+"PGP 2.x.\n"
 
-#: g10/keyedit.c:1845
-#, fuzzy
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
-"correcte � moins de red�marrer le programme.\n"
+"correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revoqu�e] "
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[expir�e] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"AVERTISSEMENT: aucun nom d'utilisateur n'a �t� d�fini comme principal.\n"
+"Cette commande risque de rendre un autre nom d'utilisateur principal\n"
+"par d�faut.\n"
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3138,485 +3437,638 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Etes-vous sur de vouloir l'ajouter ? (y/N) "
+msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 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:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"AVERTISSEMENT: C'est une cl� du style PGP2.  Ajouter un r�vocateur\n"
+"d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
+"cette cl�.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+"Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Entrez la taille de la cl�"
+msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
+"impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
+"d�sign�.\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
+"vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
+"d�sign�\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+"AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
+"est irr�versible !\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
+"d�sign� (o/N): "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "cl� %08lX: auto-signature sur le nom d'utilisateur \"%s\" invalide\n"
+msgstr "l'auto-signature v3 du nom d'utilisateur \"%s\" a �t� ignor�e\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "nom d'utilisateur: �"
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "�\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "sign� localement avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Etes-vous sur de vouloir toujours le r�voquer ? (y/N) "
+msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   sign� par %08lX � %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   r�voqu� par %08lX � %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   sign� par %08lX � %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+"AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
+"dans le futur\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Affichage %s photo d'identit� de taille %ld pour la cl� 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Politique de signature: "
+msgstr "Politique de signature critique: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Notation de signature: "
+msgstr "Notation de signature critique: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [expire: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revoqu�e] "
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "lister les cl�s et les empreintes"
+msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr " Empreinte de la cl� ="
+msgstr "   Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr " Empreinte de la cl� ="
+msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr " Empreinte de la cl� ="
+msgstr "       Empreinte de la sous-cl�:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr " Empreinte de la cl� ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "algorithme de hachage `%s' invalide\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "mauvais mot de passe ou algorithme de chiffrement inconnu (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "chiffr� avec l'algorithme inconnu %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "la cl� publique est %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 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:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %08lX, cr��e le %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "chiffr� avec %lu mots de passe\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "chiffr� avec 1 mot de passe\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "AVERTISSEMENT: l'int�grit� du message n'�tait pas prot�g�e\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
+msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Notation: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Politique: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1310
-#, 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:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "La signature a expir� le %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "              alias \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Signature faite %.*s avec la cl� %s ID %08lX\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Cl� disponible sur: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Signature expir�e de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "La signature a expir� le %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "La signature expire le %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "signature %s, algorithme de hachage %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binaire"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "modetexte"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "inconnu"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"AVERTISSEMENT: plusieurs signatures ont �t� d�t�ct�es. Seulement la "
+"premi�re\n"
+"sera v�rifi�e.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est d�conseill�; utilisez-en un\n"
 "plus standard !\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "AVERTISSEMENT: `%s' est une option d�conseill�e.\n"
+msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVERTISSEMENT: `%s' est une option d�conseill�e.\n"
+msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "utilisez \"--keyserver-options %s\" � la place\n"
+msgstr "utilisez \"%s%s\" � la place\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "D�compress�"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "D�compress�"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "ce message ne sera pas utilisable par %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "lire les options de `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "r�cipient par d�faut `%s' inconnu\n"
 
 #: 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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
+"potentiellement non s�re\n"
+
+#: g10/parse-packet.c:1128
 #, 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"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "impossible d'obtenir le pid du client pour l'agent\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 "impossible d'obtenir le descripteur de lecture du serveur\n"
 "pour l'agent\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 "impossible d'obtenir le descripteur d'�criture du serveur pour l'agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�me de communication avec ssh-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID cl� principale %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3628,32 +4080,40 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %08lX, cr��e %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Entrez le mot de passe\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez le mot de passe\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Entrez le mot de passe\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "mot de passe trop long\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "r�ponse de l'agent invalide\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "impossible de demander un mot de passe en mode automatique\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Entrez le mot de passe: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3663,271 +4123,287 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "impossible de demander un mot de passe en mode automatique\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Entrez le mot de passe: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (ID cl� principale %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %08lX...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le r�cipient anonyme.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 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:178
+#: g10/pubkey-enc.c:228
 #, 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:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les "
 "pr�f�rences\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "cl� %08lX: la cl� a �t� r�voqu�e !\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "requ�te de la cl� %08lX du serveur de cl�s HKP %s\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "erreur pendant l'envoi de `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "l'envoi � `%s' s'est d�roul� avec succ�s (r�sultat=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "recherche de \"%s\" du serveur HKP %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "impossible de chercher une cl� dans le serveur : %s\n"
+msgstr "NOTE: la cl� a �t� r�voqu�e"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "l'algorithme de protection %d%s n'est pas support�\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Mot de passe invalide ; r�essayez"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore le mot de passe.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "g�n�ration de la somme de contr�le de 16 bits (d�pr�ci�e) pour prot�ger\n"
 "la cl� secr�te\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
+msgstr "AVERTISSEMENT: conflit de hachage de signature dans le message\n"
+
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
+"AVERTISSEMENT: la sous-cl� de signature %08lX n'a pas de certificat\n"
+"crois�\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:102
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"Ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS s�re pour les\n"
-"signatures !\n"
+"AVERTISSEMENT: la sous-cl� de signature %08lX a un certificat crois�\n"
+"invalide\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "la cl� publique est plus r�cente de %lu seconde que la signature\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr ""
+"la cl� publique %08lX est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "la cl� publique est plus r�cente de %lu secondes que la signature\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr ""
+"la cl� publique %08lX est plus r�cente de %lu secondes que la signature\n"
 
 # on s'amuse comme on peut...
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTE: la cl� de signature %08lX a expir� le %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
-"la signature est suppos�e �tre fausse car un bit critique est\n"
-"inconnu\n"
+"la signature de la cl� %08lX est suppos�e �tre fausse car un bit\n"
+"critique est inconnu\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:532
 #, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "cl� %08lX: pas de sous-cl� pour le paquet de r�vocation de sous-cl�\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr ""
+"cl� %08lX: pas de sous-cl� pour la signature de liaison � la\n"
+"sous-cl�\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"impossible de mettre des donn�es de notation dans des signatures v3\n"
+"(de style PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+"impossible de mettres des donn�es de notation dans des signatures de\n"
+"cl�s v3 (de style PGP 2.x)\n"
+
+#: g10/sign.c:112
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
+"AVERTISSEMENT: impossible de faire une expansion � base de %%\n"
+"(cha�ne trop grande). Utilisation de la version non expans�e.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"impossible de mettre une URL de politique dans des signatures v3\n"
+"(de style PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"impossible de mettre une URL de politique dans des signatures de cl� v3\n"
+"(de style PGP 2.x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (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
+#: g10/sign.c:187
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (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:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "Signature %s de: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "Signature %s de: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 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"
+"il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
+"style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de cr�er %s: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, 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"
+"forcer l'algorithme de chiffrement %s (%d) entre en d�saccord avec\n"
+"les pr�f�rences du r�cipient\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -3942,12 +4418,12 @@ msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3957,199 +4433,268 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossible d'acc�der: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le r�pertoire n'existe pas !\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: impossible de cr�er le verrouillage\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: impossible de cr�er le verrou\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossible de cr�er: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: impossible de cr�er un enregistrement de version: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de confiance cr��e\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "NOTE: la base de confiance n'a pas les permissions d'�criture\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de confiance invalide\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erreur pendant la mise � jour de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erreur pendant l'�criture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance: �lseek()� a �chou�: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance: la lecture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: n'a pu mettre un enregistrement � z�ro: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n'est pas une identification de cl� longue valide\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "cl� %08lX: accept�e comme cl� de confiance.\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la cl� %08lX appara�t plusieurs fois dans la base de confiance\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cl� %08lX: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "cl� marqu�e comme ayant une confiance ultime.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %"
 "s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "jamais    "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "v�rification de la base de confiance inutile\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "v�rification de la base de confiance inutile\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "cl� publique %08lX non trouv�e : %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "faites un --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "cl� publique %08lX non trouv�e : %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d cl�s trait�es (%d comptes de validit� r�initialis�s)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la cl� publique de la cl� de confiace ultime %08lX est introuvable\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
-"v�rification � la profondeur %d sign�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4159,7 +4704,7 @@ msgstr ""
 "Rappelez-vous bien que le fichier de signature (.sig ou .asc)\n"
 "doit �tre le premier fichier indiqu� sur la ligne de commande.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -4187,15 +4732,14 @@ msgid "skipped: secret key already present\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "`%s' a �t� ignor�e: c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas\n"
 "s�re pour les signatures !\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4214,26 +4758,32 @@ msgstr "%s: suffixe inconnu\n"
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: nouveau fichier d'options cr��\n"
+msgstr " nouveau fichier de configuration `%s' cr��\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossible de cr�er le r�pertoire: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: r�pertoire cr��\n"
@@ -4260,45 +4810,45 @@ msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA n�cessite l'utilisation d'un algorithme de hachage de 160 bits\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(� moins de sp�cifier la cl� par son empreinte)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans �--yes�\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Enlever cette cl� du porte-cl�s ? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "les informations de confiance au propri�taires ont �t� effac�es\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4309,7 +4859,7 @@ msgstr ""
 "de confiance (web-of-trust); cela n'a rien � voir avec le r�seau des\n"
 "certificats (cr�� implicitement)"
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4321,86 +4871,56 @@ msgstr ""
 "en g�n�ral les cl�s dont vous avez acc�s � la cl� secr�te. R�pondez\n"
 "\"oui\" pour indiquer que votre confiance en cette cl� est ultime\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Si vous voulez utiliser cette cl� r�voqu�e quand-m�me, r�pondez �oui�."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Si vous voulez utiliser cette cl� peu s�re quand-m�me, r�pondez �oui�."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Entrez le nom d'utilisateur de la personne � qui vous voulez envoyer\n"
 "le message."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"S�lectionnez l'algorithme � utiliser.\n"
-"DSA (alias DSS) est l'algorithme de signatures �lectroniques qui ne peut\n"
-"�tre utilis� que pour les signatures. C'est l'algorithme recommand� car\n"
-"la v�rification des signatures DSA est beaucoup plus rapide que celle des\n"
-"signatures ElGamal.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"ElGamal est un algorithme pouvant � la fois �tre utilis� pour les\n"
-"signatures et le chiffrement. OpenPGP en distingue deux sortes:\n"
-"l'une destin�e uniquement au chiffrement et l'autre pouvant aussi bien\n"
-"servir aux signatures ; elles sont en fait identiques mais certains\n"
-"param�tres doivent �tre sp�cialement choisis pour que la cl� g�n�re des\n"
-"signatures s�res: ce programme est capable de le faire mais les autres\n"
-"implantations de OpenPGP ne sont pas oblig�es d'accepter cette forme de\n"
-"cl�.\n"
-"\n"
-"La premi�re cl� (cl� principale) doit toujours �tre capable de signer ;\n"
-"c'est pourquoi la cl� ElGamal de chiffrement seul est alors d�sactiv�e."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Bien que ces cl�s soient d�finies dans la RFC2440 elles ne sont pas\n"
-"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:98
+#: g10/helptext.c:87
 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 ""
+"En g�n�ral ce n'est pas une bonne id�e d'utiliser la m�me cl� pour\n"
+"signer et pour chiffrer. Cet algorithme ne doit �tre utilis� que\n"
+"pour certains domaines.\n"
+"Consultez votre expert en s�curit� d'abord."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Entrez la taille de la cl�"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "R�pondez �oui� ou �non�"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4412,19 +4932,19 @@ msgstr ""
 "mauvais - le syst�me essaierait d'interpr�ter la valeur donn�e comme un\n"
 "intervalle."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Entrez le nom du propri�taire de la cl�"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "entrez une adresse e-mail optionnelle mais hautement recommand�e"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Entrez un commentaire optionnel"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4438,11 +4958,11 @@ msgstr ""
 "O pour continuer � g�n�rer la cl�.\n"
 "Q pour arr�ter de g�n�rer de cl�."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4509,11 +5029,11 @@ msgstr ""
 "\n"
 "Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4521,11 +5041,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:209
+#: g10/helptext.c:198
 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:214
+#: g10/helptext.c:203
 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"
@@ -4536,7 +5056,7 @@ msgstr ""
 "�tablir une connection de confiance vers la cl� ou une autre cl� certifi�e\n"
 "par celle-l�."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4548,7 +5068,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:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4556,7 +5076,7 @@ msgstr ""
 "Cette signature n'est pas valide. Vous devriez la supprimer de votre\n"
 "porte-cl�s."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4570,7 +5090,7 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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"
@@ -4580,24 +5100,24 @@ msgstr ""
 "ceux qui sont s�lectionn�s) vers la liste actuelle. La date de toutes\n"
 "les auto-signatures affect�es seront avanc�es d'une seconde.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 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:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 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:259
+#: g10/helptext.c:248
 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:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4605,7 +5125,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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4634,7 +5154,7 @@ msgstr ""
 "      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4644,107 +5164,649 @@ 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:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "v�rification du porte-cl�s `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu cl�s trait�es jusqu'ici (%lu signatures)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#, fuzzy
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Choisissez une image � utiliser pour votre photo d'identit�. L'image\n"
+"doit �tre un fichier JPEG. Rappelez-vous que cette image est stock�e\n"
+"dans votre cl� publique. Si vous utilisez une image tr�s grosse, il\n"
+"en sera de m�me pour votre cl� !\n"
+"La meilleure taille � utiliser est 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Entrez le nom du fichier JPEG pour la photo d'identit�: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Impossible d'ouvrir la photo � %s �: %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "� %s � n'est pas un fichier JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Cette photo est-elle correcte (o/N/q) ? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "impossible d'afficher la photo d'identit� !\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "aucun programme d'ex�cution distante n'est support�\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"les appels aux programmes externes sont d�sactiv�s car les permissions\n"
+"du fichier d'options sont trop peu s�res\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"cette plateforme a besoin de fichiers temporaires pour appeler des\n"
+"programmes externes\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "impossible d'ex�cuter %s � %s �: %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "erreur syst�me pendant l'appel du programme externe: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "sortie non naturelle du programme externe\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "impossible d'ex�cuter le programme externe\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "impossible de lire la r�ponse du programme externe: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+"AVERTISSEMENT: impossible d'enlever le fichier temporaire\n"
+"(%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr ""
+"AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
+"%s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "jamais    "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet a �chou�: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "cl� %08lX: pas de nom d'utilisateur\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Doit �tre r�voqu� par:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(c'est une cl� de r�vocation sensible)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "sortie avec armure ASCII forc�e.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet a �chou�: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Certificat de r�vocation cr��.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "aucune cl� de r�vocation trouv�e pour `%s'\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "la cl� secr�te `%s' n'a pas �t� trouv�e: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "pas de cl� publique correspondante: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "algorithme de protection inconnu\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Certificat de r�vocation cr��.\n"
+"\n"
+"D�placez-le dans un support que vous pouvez cacher ; si Mallory a\n"
+"acc�s � ce certificat il peut l'utiliser pour rendre votre cl�\n"
+"inutilisable.\n"
+"Une bonne id�e consiste � imprimer ce certificat puis � le stocker\n"
+"ailleurs, au cas o� le support devient illisible. Mais attention :\n"
+"le syst�me d'impression de votre machine pourrait stocker ces\n"
+"donn�es et les rendre accessibles � d'autres personnes !\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "choisissez la cause de la r�vocation:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Annuler"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Cause de r�vocation: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Aucune description donn�e)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Est-ce d'accord ? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Liste des valeurs de confiance assign�es, cr��e le %s\n"
+"# (Utilisez � gpg --import-ownertrust � pour les restaurer)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "impossible d'ouvrir le fichier: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "ligne trop longue\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "erreur: symbole deux-points manquant\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "erreur: empreinte invalide\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "erreur: pas de valeur de confiance au propri�taire\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "erreur pendant la recherche de l'enregistrement de confiance: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "erreur de lecture: %s\n"
+
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "AVERTISSEMENT: l'algorithme de hachage `%s' ne fait pas partie\n"
+#~ "d'OpenPGP. Son utilisation est � vos risques et p�rils !\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[fichiers]|chiffrer les fichiers"
+
+#~ msgid "store only"
+#~ msgstr "pas d'action"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[fich.]|d�chiffrer les fichiers"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "signer une cl� irr�vocablement"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "signer une cl� localement et irr�vocablement"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "ne lister que les paquets"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "exporter les indices de confiance"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "importer les indices de confiance"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "mise � jour inattendue de la base de confiance"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "r�parer une base de confiance corrompue"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr ""
+#~ "Enlever l'armure d'un fichier ou de\n"
+#~ "l'entr�e standard"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr ""
+#~ "Mettre une armure � un fichier ou �\n"
+#~ "l'entr�e standard"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "utiliser la cl� par d�f. comme r�cipient"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "ne pas utiliser du tout le terminal"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "forcer les signatures en v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "ne pas forcer les signatures en v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "forcer les signatures en v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "ne pas forcer les signatures en v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "toujours utiliser un sceau pour le chiffrement"
+
+#~ msgid "never use a MDC for encryption"
 #~ msgstr ""
-#~ "vous devez red�marrer GnuPG pour qu'il puisse lire le nouveau\n"
-#~ "fichier �options�\n"
+#~ "ne jamais utiliser de sceau pour le\n"
+#~ "chiffrement"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "utiliser gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "mode automatique: ne jamais rien demander"
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "le changement de permission de `%s' a �chou�: %s\n"
+#~ msgid "assume yes on most questions"
+#~ msgstr "r�pondre oui � la plupart des questions"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
+#~ msgid "assume no on most questions"
+#~ msgstr "r�pondre non � la plupart des questions"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "ajouter ce porte-cl�s � la liste"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "ajouter ce porte-cl�s secret � la liste"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "indiquer o� est une cl� list�e"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOM|le terminal utilise la table de caract�res NOM"
+
+#~ msgid "read options from file"
+#~ msgstr "lire les options du fichier"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[fichier]|�crire les informations d'�tat vers ce fichier"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|IDCL�|donner une confiance ultime � cette cl�"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FICH|charger le module d'extension FICH"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "imiter le mode d�crit dans la RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "utiliser le comportement d�fini par OpenPGP"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|coder les mots de passe suivant le mode N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NOM|utiliser la fonction de hachage NOM"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|utiliser l'algorithme de compression N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "supprimer l'ident. des paquets chiffr�s"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Montrer les photos d'identit�"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Ne pas montrer les photos d'identit�"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr ""
+#~ "Choisir la ligne de commande servant �\n"
+#~ "afficher les photos d'identit�"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "l'algorithme de compression `%s' ne fonctionne qu'en lecture pour\n"
+#~ "cette version\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr ""
+#~ "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Il n'est pas s�r que cette cl� appartient vraiment � son\n"
+#~ "propri�taire mais elle est quand m�me accept�e\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "la pr�f�rence %c%lu n'est pas valide\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "NOTE: Cl� principale Elgamal d�tect�e - l'importation peut prendre un\n"
+#~ "certain temps\n"
+
+#~ msgid " (default)"
+#~ msgstr " (par d�faut)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  cr��e: %s expire: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Notation: "
+
+#~ msgid "Policy: "
+#~ msgstr "Politique: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "requ�te de la cl� %08lX de %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "erreur pendant l'envoi de `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ 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"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "ce serveur de cl�s ne supporte pas --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "recherche de \"%s\" du serveur HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "impossible de chercher une cl� dans le serveur : %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "cl� %08lX: ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS\n"
+#~ "s�re pour les signatures !\n"
+
+# on s'amuse comme on peut...
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "la cl� %08lX a �t� cr��e %lu seconde dans le futur (rupture\n"
+#~ "spatio-temporelle ou probl�me d'horloge)\n"
 
 #~ msgid ""
-#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
 #~ msgstr ""
-#~ "le premier caract�re du nom d'une notation doit �tre un lettre ou un "
-#~ "trait\n"
-#~ "de soulignement\n"
+#~ "la cl� %08lX a �t� cr��e %lu secondes dans le futur (rupture\n"
+#~ "spatio-temporelle ou probl�me d'horloge\n"
 
-#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "cl� %08lX marqu�e comme ayant une confiance ultime.\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr ""
+#~ "la signature de la cl� de signature Elgamal %08lX pour %08lX a �t�\n"
+#~ "ignor�e\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr ""
+#~ "la signature de %08lX pour la cl� de signature Elgamal %08lX a �t�\n"
+#~ "ignor�e\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "v�rification � la profondeur %d sign�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
+#~ "d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
 #~ msgstr ""
-#~ "les points dans le nom d'une notation doivent �tre entour�s d'autes "
-#~ "caract�res\n"
+#~ "S�lectionnez l'algorithme � utiliser.\n"
+#~ "DSA (alias DSS) est l'algorithme de signatures �lectroniques qui ne peut\n"
+#~ "�tre utilis� que pour les signatures. C'est l'algorithme recommand� car\n"
+#~ "la v�rification des signatures DSA est beaucoup plus rapide que celle "
+#~ "des\n"
+#~ "signatures ElGamal.\n"
+#~ "\n"
+#~ "ElGamal est un algorithme pouvant � la fois �tre utilis� pour les\n"
+#~ "signatures et le chiffrement. OpenPGP en distingue deux sortes:\n"
+#~ "l'une destin�e uniquement au chiffrement et l'autre pouvant aussi bien\n"
+#~ "servir aux signatures ; elles sont en fait identiques mais certains\n"
+#~ "param�tres doivent �tre sp�cialement choisis pour que la cl� g�n�re des\n"
+#~ "signatures s�res: ce programme est capable de le faire mais les autres\n"
+#~ "implantations de OpenPGP ne sont pas oblig�es d'accepter cette forme de\n"
+#~ "cl�.\n"
+#~ "\n"
+#~ "La premi�re cl� (cl� principale) doit toujours �tre capable de signer ;\n"
+#~ "c'est pourquoi la cl� ElGamal de chiffrement seul est alors d�sactiv�e."
 
 #~ msgid ""
-#~ "WARNING: This key already has a photo ID.\n"
-#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "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"
+#~ "Bien que ces cl�s soient d�finies dans la RFC2440 elles ne sont pas\n"
+#~ "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."
 
-#~ 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 "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu cl�s trait�es jusqu'ici (%lu signatures)\n"
 
-#~ msgid "Fingerprint:"
-#~ msgstr "Empreinte:"
+#~ msgid "key incomplete\n"
+#~ msgstr "cl� incompl�te\n"
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "              Empreinte :"
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "cl� %08lX incompl�te\n"
diff --git a/po/gl.po b/po/gl.po
index 119573bf4..7a6c09f65 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,59 +1,76 @@
 # Galician translation of GNUpg
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Jacobo Tarrio <[email protected]>, 2001.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Jacobo Tarrio <[email protected]>, 2001, 2002, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-05-14 13:21+0200\n"
+"Project-Id-Version: gnupg 1.2.4\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "Aviso: ��sase unha zona insegura de memoria!\n"
+msgstr "AVISO: ��sase memoria insegura!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "mire en http://www.gnupg.org/faq.html para obter m�is informaci�n\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
-msgstr "si"
+msgstr "si|sim"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
-msgstr "non"
+msgstr "non|nom"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "abandonar"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "aA"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "v"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "erro xeral"
@@ -250,7 +267,6 @@ msgstr "non cifrado"
 msgid "not processed"
 msgstr "non procesado"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "chave p�blica non utilizable"
@@ -263,73 +279,80 @@ msgstr "chave secreta non utilizable"
 msgid "keyserver error"
 msgstr "erro do servidor de chaves"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � un erro (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un ficheiro normal - ign�rase\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: o ficheiro random_seed est� baleiro\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "aviso: tama�o de random_seed non v�lido - non se emprega\n"
+msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "non se pode ler de `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "non se pode escribir en `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -356,7 +379,32 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "o algoritmo de resumo `%s' � de s� lectura nesta versi�n\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Agarde, por favor; estase a colleitar entrop�a. Traballe un\n"
+"pouco se iso evita que se aburra, que iso ha aumenta-la\n"
+"calidade da entrop�a.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -364,163 +412,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[ficheiros]|cifrar ficheiros"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "s� armacenar"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[ficheiros]|descifrar ficheiros"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "asinar unha chave de xeito non revocable"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "asinar unha chave localmente e de xeito non revocable"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "listar s� a secuencia de paquetes"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "exporta-los valores de confianza no propietario"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importa-los valores de confianza no propietario"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "actualizaci�n inatendida da base de datos de confianza"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "ama�ar unha base de datos de confianza corrompida"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "Quita-la armadura a un ficheiro ou � entrada est�ndar"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "P�r armadura a un ficheiro ou � entrada est�ndar"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -530,199 +543,55 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "usa-la chave por defecto coma o destinatario por defecto"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "ser un pouqui�o m�is calado"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "non usa-la terminal en absoluto"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "forzar sinaturas v3"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "non forzar sinaturas v3"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "forzar sinaturas de chave v4"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "non forzar sinaturas de chave v4"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "sempre usar un MDC para cifrar"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "nunca usar un MDC para cifrar"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "emprega-lo gpg-agent"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "modo por lotes: non preguntar nunca"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "asumir `si' na maior�a das preguntas"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "asumir `non' na maior�a das preguntas"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "engadir este chaveiro � lista de chaveiros"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "engadir este chaveiro secreto � lista"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "amosar en que chaveiro est� unha chave listada"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOME|empregar NOME coma chave secreta por defecto"
+msgstr "avisar antes de sobrescribir"
 
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "le-las opci�ns dun ficheiro"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|DF|escribi-la informaci�n de estado a este DF"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[ficheiro]|escribi-la informaci�n de estado no ficheiro"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|IDCHAVE|confiar absolutamente nesta chave"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emula-lo modo descrito no RFC1991"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento "
-"OpenPGP"
 
-#: g10/g10.c:443
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
-"axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento PGP 2."
-"x"
-
-#: g10/g10.c:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|emprega-lo modo de contrasinal N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Amosar Identificaci�ns Fotogr�ficas"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "Non amosar Identificaci�ns Fotogr�ficas"
-
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "Estabrece-la li�a de comando para ve-las Identificaci�ns Fotogr�ficas"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -730,7 +599,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -750,17 +619,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -770,7 +639,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -778,448 +647,653 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "P�blica: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Cifra: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Compresi�n: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1172
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "Aviso: propiedade insegura en %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1178
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1181
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "Aviso: propiedade insegura en %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1184
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1190
 #, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
+msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, 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:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTA: �%s non � para uso normal!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
+"non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: versi�n do ficheiro incorrecta %d\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "opci�ns de exportaci�n non v�lidas\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "armadura non v�lida"
+msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: versi�n do ficheiro incorrecta %d\n"
+msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "chaveiro incorrecto"
+msgstr "opci�ns de exportaci�n non v�lidas\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "opci�ns de importaci�n non v�lidas\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "opci�ns de exportaci�n non v�lidas\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTA: �%s non � para uso normal!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "esta mensaxe pode non ser utilizable por PGP 2.x\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:1845
-#, 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:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
+
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 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:1862
-msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
-
-#: g10/g10.c:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "preferencias non v�lidas\n"
+msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "preferencias non v�lidas\n"
+msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "preferencias non v�lidas\n"
+msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "preferencias non v�lidas\n"
+msgstr "preferencias de compresi�n personais non v�lidas\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "�%s a�nda non traballa con %s!\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
+
+#: g10/g10.c:2778
 #, 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:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [ficheiro]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "non se pode empregar %s no modo %s\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [ficheiro]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "non se pode empregar %s no modo %s\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-de-usuario"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-de-usuario"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "o env�o ao servidor de chaves fallou: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "a recepci�n do servidor de chaves fallou: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "a exportaci�n da chave fallou: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "a busca no servidor de chaves fallou fallou: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
+"rematar en '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+
+#: g10/g10.c:3678
 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:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "ser un pouqui�o m�is calado"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "toma-las chaves deste chaveiro"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "converte-los conflictos de selo de data nun aviso"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|DF|escribi-la informaci�n de estado a este DF"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sintaxe: gpg [opci�ns] [ficheiros]\n"
+"Comproba as sinaturas contra chaves de confianza co�ecidas\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "cabeceira de armadura non v�lida: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "cabeceira de sinatura en claro non v�lida\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "sinaturas en texto claro ani�adas\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "A chave � obsoleta"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "Motivo para a revocaci�n: "
+msgstr "motivo para a revocaci�n: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Comentario de revocaci�n: "
+msgstr "comentario de revocaci�n: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMsSoO"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Non se asignou un valor de confianza a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "               alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "               alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1230,189 +1304,212 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = Non sei\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = NON conf�o\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Conf�o absolutamente\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = voltar ao men� principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " o = omitir esta chave\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " s = sa�r\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "�Est� seguro de querer dar confianza absoluta a esta chave? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: �esta chave est� revocada!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "�Empregar esta chave de t�dolos xeitos?"
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chave %08lX: �unha subchave est� revocada!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave caducou\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Esta chave NON � de confianza\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Non � seguro que esta chave pertenza de verdade ao seu propietario\n"
-"pero ac�ptase de t�dolos xeitos\n"
+"%08lX: Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave probablemente pertenza ao propietario\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Esta chave pert�ncenos a n�s\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"NON � seguro que a chave pertenza ao seu propietario.\n"
-"Se *de verdade* sabe o que est� a facer, pode respostar �\n"
-"seguinte pregunta cun \"si\"\n"
+"NON � seguro que a chave pertenza � persoa indicada no ID de\n"
+"usuario. Se *de verdade* sabe o que est� a facer, pode\n"
+"respostar � seguinte pregunta cun \"si\"\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: �Empr�gase unha chave que non � de confianza!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
+"ausente.\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "       Isto pode significar que a sinatura est� falsificada.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave est� desactivada.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta chave xa caducou!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: �Esta chave NON � de confianza!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "non se pode empregar %s no modo %s\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1420,131 +1517,127 @@ msgstr ""
 "\n"
 "Introduza o ID de usuario. Remate cunha li�a en branco: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 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:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr "a preferencia %c%lu non � v�lida\n"
-
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "caracter non v�lido na cadea de preferencias\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "demasiadas preferencias `%c'\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "caracter non v�lido na cadea de preferencias\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "escribindo a propia sinatura\n"
+msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (asinar e cifrar)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (asinar e cifrar)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1557,36 +1650,28 @@ msgstr ""
 "        tama�o de chave por defecto: 1024 bits\n"
 " tama�o de chave m�ximo recomendado: 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA s� admite tama�os entre 512 e 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1594,11 +1679,11 @@ msgstr ""
 "�As chaves maiores de 2048 bits non se aconsellan porque\n"
 "os c�lculos levan MOITO tempo!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "�Est� seguro de que quere este tama�o de chave? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1606,17 +1691,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1632,7 +1717,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1648,30 +1733,29 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1679,11 +1763,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1699,44 +1783,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1747,28 +1831,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1776,16 +1860,16 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1797,7 +1881,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1809,53 +1893,58 @@ 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:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "sent�molo, non se pode facer isto no modo por lotes\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "gravando a chave secreta en `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 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:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "chave marcada coma de confianza absoluta.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1864,12 +1953,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1877,7 +1966,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1885,569 +1974,646 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "�Crear realmente? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: non se pode abrir: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "fallou a sinatura: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro baleiro\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "s� pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
 
-#: g10/encode.c:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 "non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, 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:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Non se admite este comando no modo %s.\n"
+msgstr ""
+"forza-lo algoritmo de compresi�n %s (%d) viola as preferencias do "
+"destinatario\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s cifrado para: %s\n"
+msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "chave %08lX: non � unha chave rfc2440 - omitida\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+"AVISO: a chave secreta %08lX non ten unha suma de comprobaci�n SK simple\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+"non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sen chave p�blica - ignorada\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "           importadas: %lu"
+msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "chave %08lX: non hai ID de usuario\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Asinou estes IDs de usuario: \n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:597
+#: g10/import.c:588
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "chave %08lX: non hai sub-chave para o enlace da chave\n"
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:612
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "chave %08lX: non hai ID de usuario\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "chave %08lX: chave p�blica importada\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: 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:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: 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:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "chave %08lX: 1 novo ID de usuario\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "chave %08lX: %d novos IDs de usuario\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "chave %08lX: 1 nova sinatura\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "chave %08lX: %d novas sinaturas\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "chave %08lX: 1 nova sub-chave\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
+
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "chave %08lX: %d novas sub-chaves\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:774
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "chave %08lX: sin cambios\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "chave %08lX: certificado de revocaci�n importado\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1047
-#, 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:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "chave %08lX: non hai sub-chave para o enlace da chave\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "chave %08lX.%lu: Revocaci�n de subchave v�lida\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "chave %08lX: enlace de sub-chave incorrecto\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
-msgstr "chave %08lX: pasado por alto o ID de usuario '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
-msgstr "chave %08lX: pasada por alto a sub-chave\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "chave %08lX: omitida a sub-chave\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, 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:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1203
-#, 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:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1220
-#, 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:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr ""
-"chave %08lX: certificado de revocaci�n no lugar err�neo - pasada\n"
-"por alto\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr "chave %08lX: ID de usuario duplicado detectado - mezclado\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1636
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"Aviso: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
+"AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1403
+#: g10/import.c:1711
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"Aviso: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
+"AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "chave %08lX: certificado de revocaci�n engadido\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 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:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Conf�o marxinalmente\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Conf�o totalmente\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "AVISO: `%s' � un ficheiro baleiro\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
+
+#: g10/keyedit.c:584
+#, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"A s�a sinatura actual en \"%s\"\n"
-"� unha sinatura local.\n"
+"A auto-sinatura de \"%s\"\n"
+"� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
+msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"A s�a sinatura actual en \"%s\"\n"
+"caducou.\n"
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
+
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2456,50 +2622,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2508,27 +2678,31 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2536,32 +2710,31 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
+msgstr ""
+"\n"
+"Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"A sinatura hase marcar coma non exportable.\n"
+"AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"A sinatura hase marcar coma non revocable.\n"
+"AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2569,7 +2742,7 @@ msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2577,7 +2750,7 @@ msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2585,7 +2758,7 @@ msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2593,7 +2766,7 @@ msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2601,33 +2774,34 @@ msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 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:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2635,7 +2809,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2643,472 +2817,570 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "gardar"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "axuda"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "listar"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "selecciona-la chave secundaria N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "verificar"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "listar sinaturas"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "v"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "asina-la chave"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "f"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "facer unha sinatura separada"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "asina-la chave de xeito non revocable"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "asina-la chave localmente e de xeito non revocable"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "depurar"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "borrar un ID de usuario"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "engadir unha chave secundaria"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "addkey"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "engadir unha chave secundaria"
+msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "borrar sinaturas"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "erro do servidor de chaves"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "non se puido analisa-lo URI do servidor de chaves\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "revocar un ID de usuario"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "�Seguro de que quere revocar este ID de usuario? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "estabrece-la lista de preferencias"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Resumo: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Caracter�sticas: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
 msgid "This key may be revoked by %s key "
-msgstr "Esta chave pode estar revocada por %s chave %s%s\n"
+msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, c-format
-msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revocada] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [caduca: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [caduca: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! revocouse a subchave: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- atopouse unha revocaci�n falsa\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
 
-#: g10/keyedit.c:1837
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revocada] "
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 #, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
+
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
-"correcta ata que reinicie o programa.\n"
+"correcta a menos que reinicie o programa.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revocada] "
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[caducada ]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
+"              facer que un ID de usuario diferente se converta no primario.\n"
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3117,482 +3389,626 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
-msgstr "�Borrar esta sinatura correcta? (y/N/q)"
+msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "�Borrar esta sinatura incorrecta? (y/N/q)"
+msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "�Borrar esta sinatura desco�ecida? (y/N/q)"
+msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
-msgstr "�Realmente quere borrar esta auto-sinatura? (y/N)"
+msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"AVISO: Esta � unha chave de estilo PGP 2.x. Se engade un revocador "
+"designado\n"
+"       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+"Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Introduza o tama�o da chave"
+msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
+"non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
+"AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
+"se pode desfacer!\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
 msgstr ""
-"chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con �ndice %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "asinado localmente coa s�a chave %08lX no %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#. FIXME: detect duplicates here
-#: g10/keyedit.c:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
-msgstr "Firmou estes IDs de usuario: \n"
+msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+"AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Amosando a id. fotogr�fica %s de tama�o %ld da chave 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Normativa de sinaturas: "
+msgstr "Normativa de sinaturas cr�ticas: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Notaci�n de sinaturas: "
+msgstr "Notaci�n de sinaturas cr�ticas: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [caduca: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revocada] "
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "ve-la lista de chaves e pegadas dactilares"
+msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "     Pegada dactilar ="
+msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "     Pegada dactilar ="
+msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "     Pegada dactilar ="
+msgstr "     Pegada dactilar da sub-chave:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "algoritmo de hash non v�lido `%s'\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "contrasinal incorrecto ou algoritmo de cifrado desco�ecido (%d)\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "chave de sesi�n cifrada con %s\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "cifrado cun algoritmo desco�ecido %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "cifrado con %lu contrasinais\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "cifrado con 1 contrasinal\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Notaci�n: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Normativa: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "Asinada o %.*s usando %s coa chave de ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "A sinatura caducou o %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "               alias \""
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Chave dispo�ible en: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "A sinatura caducou o %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "A sinatura caduca o %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binario"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "modo texto"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "desco�ecido"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "�Os algoritmos experimentais non deber�an ser usados!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de cifrado est� obsoleto; por favor, empregue un m�is "
 "est�ndar!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 "mire en http://www.gnupg.org/why-not-idea.html para obter m�is informaci�n\n"
 
-#: g10/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "AVISO: %s � unha opci�n a extinguir.\n"
+msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVISO: %s � unha opci�n a extinguir.\n"
+msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "empregue \"--keyserver-options %s\" no seu canto\n"
+msgstr "empregue \"%s%s\" no seu canto\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Sen comprimir"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Sen comprimir"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "esta mensaxe pode non ser utilizable por %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "lendo as opci�ns de `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "destinatario por defecto `%s' desco�ecido\n"
 
 #: 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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
+
+#: g10/parse-packet.c:1128
 #, 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"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "non se pode estabrece-lo pid do cliente para o axente\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3603,32 +4019,40 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Introduza o contrasinal\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Introduza o contrasinal\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "contrasinal demasiado longo\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "resposta do axente non v�lida\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Introduza o contrasinal: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3638,256 +4062,271 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Introduza o contrasinal: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; tentando a chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 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:178
+#: g10/pubkey-enc.c:228
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "o algoritmo de cifrado %d%s � desco�ecido ou est� desactivado\n"
 
-#: g10/pubkey-enc.c:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "chave %08lX: �esta chave est� revocada!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "solicitando a chave %08lX do servidor de chaves HKP %s\n"
+msgstr "NOTA: a chave est� revocada"
 
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "non se pode obte-la chave do servidor de chaves: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "erro ao enviar a `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "�xito ao enviar a `%s' (estado=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "fallo ao enviar a `%s': estado=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "buscando \"%s\" no servidor HKP %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "non se pode buscar no servidor de chaves: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Contrasinal non v�lido; por favor, t�nteo de novo"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Detectouse unha chave feble - por favor, cambie o contrasinal outra "
 "vez.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "xerando o checksum de 16-bits a extinguir para a protecci�n da chave "
 "secreta\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
+msgstr "AVISO: conflicto de resumo de sinatura na mensaxe\n"
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:102
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"�esta � unha chave ElGamal xerada por PGP que non � segura para sinaturas!\n"
+"AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
+"se pode desfacer!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "a chave p�blica � %lu segundo m�is nova c� sinatura\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "a chave p�blica � %lu segundos m�is nova c� sinatura\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "a chave p�blica %08lX � %lu segundos m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"asumindo unha sinatura incorrecta da chave %08lX debido a un bit cr�tico "
+"desco�ecido\n"
+
+#: g10/sig-check.c:532
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
-"asumindo unha sinatura incorrecta debido a un bit cr�tico desco�ecido\n"
+"chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
+"subchave\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:558
 #, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "chave %08lX: non hai sub-chave para a sinatura da ligaz�n da chave\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"non se pode po�er datos de notaci�n nas sinaturas v3 (estilo PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+"non se pode po�er datos de notaci�n nas sinaturas de chave v3 (estilo PGP 2."
+"x)\n"
+
+#: g10/sign.c:112
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"AVISO: non se pode expandir-%% a notaci�n (grande de m�is). �sase sen "
+"expandir.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"non se pode po�er un URL de pol�tica nas sinaturas v3 (estilo PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"non se pode po�er un URL de pol�tica nas sinaturas de chave v3 (estilo PGP 2."
+"x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:151
-#, c-format
+#: g10/sign.c:187
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "Sinatura %s de: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "s� pode asinar con chaves estilo PGP 2.x no modo --pgp2\n"
+msgstr ""
+"s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
+"pgp2\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, 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"
+msgstr ""
+"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -3902,12 +4341,12 @@ msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3917,199 +4356,267 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n da base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: non � posible acceder: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �o directorio non existe!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: non se pode crea-lo bloqueo\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: non se pode bloquear\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: non se pode crear: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: non se puido crea-lo rexistro de versi�n: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non v�lida\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un ID longo de chave v�lido\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceptada como chave de confianza\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "a chave %08lX aparece m�is dunha vez na base de datos de confianza\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "chave marcada coma de confianza absoluta.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petici�n %d: fallou a lectura: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "nunca     "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "non se precisa comproba-la base de datos de confianza\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "non se precisa comproba-la base de datos de confianza\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "non se atopou a chave p�blica %08lX: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "por favor, execute con --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "non se atopou a chave p�blica %08lX: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "non se atoparon chaves de confianza absoluta\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
-"comprobando con profundidade %d asinadas=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
-"d\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4119,7 +4626,7 @@ msgstr ""
 "Por favor, lembre que o ficheiro de sinatura (.sig ou .asc) deber�a\n"
 "se-lo primeiro ficheiro que se indique na li�a de comandos.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -4146,15 +4653,14 @@ msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"ignorouse `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
+"om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
 "para sinaturas!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4173,26 +4679,31 @@ msgstr "%s: sufixo desco�ecido\n"
 msgid "Enter new filename"
 msgstr "Introduza o novo nome de ficheiro"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "escribindo na sa�da est�ndar\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: creouse un novo ficheiro de opci�ns\n"
+msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: non foi posible crear un directorio: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directorio creado\n"
@@ -4217,46 +4728,46 @@ msgstr ""
 "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
 "veces\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(a menos que especifique a chave por pegada dactilar)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
 "iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "�Borrar esta chave do chaveiro? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "�Esta � unha chave secreta! - �est� seguro de que quere borrala? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "borrouse a informaci�n de confianza\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4266,7 +4777,7 @@ msgstr ""
 "a ning�n terceiro. Prec�sase para implementa-la rede de confianza; non ten\n"
 "nada que ver coa rede de certificados."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4277,83 +4788,53 @@ msgstr ""
 "confianza absoluta - esas adoitan se-las chaves das que ten acceso � chave\n"
 "secreta. Responda \"si\" para lle dar confianza total a esta chave\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Se desexa empregar esta chave revocada, conteste \"si\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se desexa empregar esta clave na que non se conf�a, conteste \"si\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Introduza o ID de usuario da persoa � que lle quere manda-la mensaxe."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Seleccione o algoritmo a usar.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (tam�n chamado DSS) � un algoritmo de sinatura dixital, que s� se pode\n"
-"empregar para asinar. � o algoritmo aconsellado porque � moito m�is r�pido\n"
-"verificar unha sinatura DSA que unha sinatura ElGamal.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal � un algoritmo que se pode empregar para asinar e cifrar. OpenPGP\n"
-"distingue entre d�as variantes do algoritmo: un que s� cifra e outro que\n"
-"asina e cifra; realmente � o mesmo, pero hai que escoller alg�ns par�metros\n"
-"dun xeito especial para crear unha clave que sexa segura para asinar: este\n"
-"programa faino, pero outras implementaci�ns de OpenPGP non te�en por que\n"
-"entende-la variante de asinado+cifrado.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"A primeira clave (a primaria) debe ser sempre unha clave capaz de asinar;\n"
-"este � o motivo polo que a clave ElGamal que s� cifra non est� dispo�ible\n"
-"neste men�."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"A�nda que estas chaves est�n definidas no RFC2440, non se aconsellan\n"
-"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:98
+#: g10/helptext.c:87
 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 ""
+"En xeral non � unha boa idea emprega-la mesma chave para asinar e cifrar.\n"
+"Este algoritmo deber�a empregarse s� en determinados dominios.\n"
+"Consulte antes co seu experto en seguridade."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Introduza o tama�o da chave"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Conteste \"si\" ou \"non\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4365,19 +4846,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:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Introduza o nome do propietario da chave"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 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:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Por favor, introduza un comentario (opcional)"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4391,11 +4872,11 @@ msgstr ""
 "O  para continuar coa xeraci�n da chave.\n"
 "S  para sa�r da xeraci�n da chave."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4468,11 +4949,11 @@ msgstr ""
 "\n"
 "Se non sabe cal � a resposta correcta, resposte \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4480,11 +4961,11 @@ msgstr ""
 "Conteste \"si\" se realmente desexa borrar este ID de usuario.\n"
 "�Tam�n se han perder t�dolos certificados!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Conteste \"si\" se � correcto borrar esta subchave"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4494,7 +4975,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4506,13 +4987,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:225
+#: g10/helptext.c:214
 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:229
+#: g10/helptext.c:218
 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"
@@ -4526,7 +5007,7 @@ msgstr ""
 "s� se esta auto-sinatura non � correcta por algun motivo e hai\n"
 "unha segunda � s�a disposici�n."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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"
@@ -4536,24 +5017,24 @@ msgstr ""
 "� lista actual de preferencias. A marca de tempo de t�dalas auto-sinaturas\n"
 "afectadas ha avanzar un segundo.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 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:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Conteste \"si\" se � correcto sobrescribi-lo ficheiro"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4561,7 +5042,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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4589,7 +5070,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:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4599,73 +5080,673 @@ 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:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Non hai axuda dispo�ible"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existen dous ficheiros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o que non cambiou\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, ama�e este posible fallo de seguridade\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu chaves comprobadas ata o momento (%lu sinaturas)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Escolla unha imaxe a empregar coma identificaci�n fotogr�fica. A imaxe ten\n"
+"que ser un ficheiro JPEG. Lembre que a imaxe armac�nase coa s�a chave\n"
+"p�blica. Se emprega unha imaxe moi grande, a s�a chave tam�n se ha volver\n"
+"moi grande. Un bo tama�o para empregar � un semellante a 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Introduza o nome do ficheiro JPEG: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Non se puido abri-la foto \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "�Est� seguro de que quere empregala (s/N)? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" non � un ficheiro JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "�� esta foto correcta (s/N/q)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "non se soporta a execuci�n remota de programas\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "non se pode crea-lo directorio `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"as chamadas a programas externos est�n desactivadas debido a opci�ns de "
+"permisos de ficheiros non seguras\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"esta plataforma precisa de ficheiros temporais ao chamar a programas "
+"externos\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "non se puido executar %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "erro do sistema ao chamar a un programa externo: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "sa�da non natural do programa externo\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "non se puido executar un programa externo\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "non se puido le-la resposta do programa externo: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "nunca     "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "a chamada a build_packet fallou: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "chave %08lX: non hai ID de usuario\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Ha ser revocada por:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Esta � unha chave de revocaci�n sensible)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "Forzouse unha sa�da con armadura ASCII.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "a chamada a make_keysig_packet fallou: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Creouse o certificado de revocaci�n.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "non se atopou a chave secreta `%s': %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "non hai unha chave p�blica correspondente: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "�a chave p�blica con coincide coa chave secreta!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "algoritmo de protecci�n desco�ecido\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOTA: �Esta chave non est� protexida!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Creouse o certificado de revocaci�n.\n"
+"\n"
+"Por favor, trasl�deo a un soporte que poida agochar; se Mallory consegue\n"
+"acceso a este certificado pode empregalo para inutiliza-la s�a chave.\n"
+"� unha boa idea imprimir este certificado e armacenalo, por se o soporte\n"
+"se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
+"m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Por favor, escolla o motivo da revocaci�n:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(probablemente queira seleccionar %d aqu�)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Motivo para a revocaci�n: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Non se deu unha descrici�n)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "�� correcto? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Lista de valores de confianza asignados, creada o %s\n"
+"# (Empregue \"gpg --import-ownertrust\" para restauralos)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "non se puido abrir un ficheiro: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "li�a longa de m�is\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "erro: falla un signo de dous puntos\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "erro: pegada dactilar non v�lida\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "erro: non hai un valor de confianza no propietario\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "erro ao buscar un rexistro de confianza: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "erro de lectura: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "AVISO: o resumo `%s' non forma parte de OpenPGP.\n"
+#~ "       Empr�gueo baixo a s�a propia responsabilidade.\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[ficheiros]|cifrar ficheiros"
+
+#~ msgid "store only"
+#~ msgstr "s� armacenar"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[ficheiros]|descifrar ficheiros"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "asinar unha chave de xeito non revocable"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "asinar unha chave localmente e de xeito non revocable"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "listar s� a secuencia de paquetes"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "exporta-los valores de confianza no propietario"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "importa-los valores de confianza no propietario"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "actualizaci�n inatendida da base de datos de confianza"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "ama�ar unha base de datos de confianza corrompida"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Quita-la armadura a un ficheiro ou � entrada est�ndar"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "P�r armadura a un ficheiro ou � entrada est�ndar"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usa-la chave por defecto coma o destinatario por defecto"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "non usa-la terminal en absoluto"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "forzar sinaturas v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "non forzar sinaturas v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "forzar sinaturas de chave v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "non forzar sinaturas de chave v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "sempre usar un MDC para cifrar"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "nunca usar un MDC para cifrar"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "emprega-lo gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "modo por lotes: non preguntar nunca"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "asumir `si' na maior�a das preguntas"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "asumir `non' na maior�a das preguntas"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "engadir este chaveiro � lista de chaveiros"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "engadir este chaveiro secreto � lista"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "amosar en que chaveiro est� unha chave listada"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NOME|empregar NOME coma chave secreta por defecto"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
+
+#~ msgid "read options from file"
+#~ msgstr "le-las opci�ns dun ficheiro"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[ficheiro]|escribi-la informaci�n de estado no ficheiro"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|IDCHAVE|confiar absolutamente nesta chave"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emula-lo modo descrito no RFC1991"
+
+#~ 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"
+
+#~ 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 "
+#~ "PGP 2.x"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|emprega-lo modo de contrasinal N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|emprega-lo algoritmo de compresi�n N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Amosar Identificaci�ns Fotogr�ficas"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Non amosar Identificaci�ns Fotogr�ficas"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr ""
+#~ "Estabrece-la li�a de comando para ve-las Identificaci�ns Fotogr�ficas"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "o algoritmo de compresi�n `%s' � de s� lectura nesta versi�n\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "o algoritmo de compresi�n debe estar entre %d e %d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Non � seguro que esta chave pertenza de verdade ao seu "
+#~ "propietario\n"
+#~ "pero ac�ptase de t�dolos xeitos\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "a preferencia %c%lu non � v�lida\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "chave %08lX: non � unha chave rfc2440 - omitida\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "NOTA: Detectouse unha clave primaria Elgamal - ha tomar alg�n tempo "
+#~ "importala\n"
+
+#~ msgid " (default)"
+#~ msgstr " (por defecto)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Notaci�n: "
+
+#~ msgid "Policy: "
+#~ msgstr "Normativa: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "solicitando a chave %08lX de %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "non se pode obte-la chave do servidor de chaves: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "erro ao enviar a `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ 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"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "este servidor de chaves non soporta --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "buscando \"%s\" no servidor HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "non se pode buscar no servidor de chaves: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "chave %08lX: �esta � unha chave ElGamal xerada por PGP que NON � xegura "
+#~ "para sinaturas!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "creouse a chave %08lX %lu segundo no futuro (salto no tempo ou problemas "
+#~ "co reloxo)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "creouse a chave %08lX %lu segundos no futuro (salto no tempo ou problemas "
+#~ "co reloxo)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "chave %08lX marcada coma de confianza absoluta\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr ""
+#~ "omitiuse dende a sinatura da chave de sinatura Elgamal %08lX ata %08lX\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr ""
+#~ "omitiuse dende %08lX ata a sinatura da chave de sinatura Elgamal %08lX\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "comprobando con profundidade %d asinadas=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%"
+#~ "d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Seleccione o algoritmo a usar.\n"
+#~ "\n"
+#~ "DSA (tam�n chamado DSS) � un algoritmo de sinatura dixital, que s� se "
+#~ "pode\n"
+#~ "empregar para asinar. � o algoritmo aconsellado porque � moito m�is "
+#~ "r�pido\n"
+#~ "verificar unha sinatura DSA que unha sinatura ElGamal.\n"
+#~ "\n"
+#~ "ElGamal � un algoritmo que se pode empregar para asinar e cifrar. "
+#~ "OpenPGP\n"
+#~ "distingue entre d�as variantes do algoritmo: un que s� cifra e outro que\n"
+#~ "asina e cifra; realmente � o mesmo, pero hai que escoller alg�ns "
+#~ "par�metros\n"
+#~ "dun xeito especial para crear unha clave que sexa segura para asinar: "
+#~ "este\n"
+#~ "programa faino, pero outras implementaci�ns de OpenPGP non te�en por que\n"
+#~ "entende-la variante de asinado+cifrado.\n"
+#~ "\n"
+#~ "A primeira clave (a primaria) debe ser sempre unha clave capaz de "
+#~ "asinar;\n"
+#~ "este � o motivo polo que a clave ElGamal que s� cifra non est� "
+#~ "dispo�ible\n"
+#~ "neste men�."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "A�nda que estas chaves est�n definidas no RFC2440, non se aconsellan\n"
+#~ "porque non est�n soportadas por t�dolos programas, e as sinaturas\n"
+#~ "creadas con elas son moi grandes e lentas de comprobar."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu chaves comprobadas ata o momento (%lu sinaturas)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "chave incompleta\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "chave %08lX incompleta\n"
+
 #, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "quit|sa�r"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (asinar e cifrar)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "O emprego deste algoritmo s� est� soportado en GnuPG. Non ha poder "
+#~ "empregar\n"
+#~ "esta clave para se comunicar con usuarios de PGP. Este algoritmo tam�n �\n"
+#~ "moi lento, e pode non ser tan seguro coma as outras opci�ns.\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "�Crear de t�dolos xeitos? "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "detectouse un algoritmo de chave sim�trica non v�lido (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "este servidor de chaves non � totalmente compatible con HKP\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr "Este algoritmo est� obsoleto - �crear de t�dolos xeitos? "
+
 #~ msgid ""
 #~ "you have to start GnuPG again, so it can read the new configuration file\n"
 #~ msgstr ""
-#~ "ten que iniciar GnuPG outra vez para que lea o novo ficheiro de opci�ns\n"
+#~ "ten que iniciar GnuPG outra vez para que lea o novo ficheiro de "
+#~ "configuraci�n\n"
 
 #~ msgid "changing permission of  `%s' failed: %s\n"
 #~ msgstr "o cambio de permisos de `%s' fallou: %s\n"
@@ -4817,9 +5898,6 @@ msgstr "%s: chaveiro creado\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "erro ao le-la chave primaria para o LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record fallou: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "chave %08lX: a consulta do rexistro fallou\n"
 
@@ -4832,9 +5910,6 @@ msgstr "%s: chaveiro creado\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "chave %08lX: as chaves secreta e p�blica non coinciden\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "erro ao enumera-las chaves secretas: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "chave %08lX.%lu: Ligadura de subchave correcta\n"
 
@@ -4894,9 +5969,6 @@ msgstr "%s: chaveiro creado\n"
 #~ msgid "lid %lu: inserted\n"
 #~ msgstr "lid %lu: inserido\n"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "erro lendo o rexistro de directorio: %s\n"
-
 #~ msgid "\t%lu keys with errors\n"
 #~ msgstr "\t%lu chaves con erros\n"
 
@@ -4969,9 +6041,6 @@ msgstr "%s: chaveiro creado\n"
 #~ msgid "do not write comment packets"
 #~ msgstr "non escribir paquetes de comentario"
 
-#~ msgid "(default is 1)"
-#~ msgstr "(por defecto � 1)"
-
 #~ msgid "(default is 3)"
 #~ msgstr "(por defecto � 3)"
 
diff --git a/po/hu.po b/po/hu.po
new file mode 100644
index 000000000..176a014c1
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,5705 @@
+# GnuPG Hungarian translation.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Nagy Ferenc L�szl� <[email protected]>, 2003, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.2.5\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-19 21:53+0200\n"
+"Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
+"Language-Team: Hungarian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: util/secmem.c:90
+msgid "WARNING: using insecure memory!\n"
+msgstr "FIGYELEM: Nem biztons�gos mem�ri�t haszn�lunk!\n"
+
+#: util/secmem.c:91
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr "Tov�bbi inform�ci� a http://www.gnupg.org/faq.html c�men tal�lhat�.\n"
+
+#: util/secmem.c:340
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
+
+#: util/secmem.c:341
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
+
+#: util/miscutil.c:307 util/miscutil.c:344
+msgid "yes"
+msgstr "igen"
+
+#: util/miscutil.c:308 util/miscutil.c:349
+msgid "yY"
+msgstr "iI"
+
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "nem"
+
+#: util/miscutil.c:311 util/miscutil.c:350
+msgid "nN"
+msgstr "nN"
+
+#: util/miscutil.c:348 g10/keyedit.c:1138
+msgid "quit"
+msgstr "kil�p�s|kilepes"
+
+#: util/miscutil.c:351
+msgid "qQ"
+msgstr "kK"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "�ltal�nos hiba"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "ismeretlen csomagt�pus"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "ismeretlen verzi�"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "ismeretlen kivonatol� algoritmus"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "rossz nyilv�nos kulcs"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "rossz titkos kulcs"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "rossz al��r�s"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "hib�s ellen�rz��sszeg"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "rossz jelsz�"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "nyilv�nos kulcs nem tal�lhat�"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "ismeretlen rejtjelez� algoritmus"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "nem lehet megnyitni a kulcskarik�t"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "�rv�nytelen csomag"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "�rv�nytelen p�nc�l"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "nincs ilyen felhaszn�l�i azonos�t�"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "titkos kulcs nem �ll rendelkez�sre"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "rossz titkos kulcs haszn�lata"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "nem t�mogatott"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "rossz kulcs"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "�llom�nyolvas�si hiba"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "�llom�ny�r�si hiba"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "ismeretlen t�m�r�t� algoritmus"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "�llom�nymegnyit�si hiba"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "�llom�nyl�trehoz�si hiba"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "�rv�nytelen jelsz�"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "nem megval�s�tott nyilv�nos kulcs� algoritmus"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "nem megval�s�tott rejtjelez� algoritmus"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "ismeretlen al��r�soszt�ly"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "hib�s bizalmi adatb�zis"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "hib�s MPI"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "er�forr�shat�r"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "�rv�nytelen kulcskarika"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "rossz igazol�s"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "rossz form�j� felhaszn�l�i azonos�t�"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "�llom�nyz�r�si hiba"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "�llom�ny�tnevez�si hiba"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "�llom�nyt�rl�si hiba"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "nem v�rt adat"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "id�b�lyeg-konfliktus"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "haszn�lhatatlan nyilv�nos kulcs� algoritmus"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "�llom�ny l�tezik"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "gyenge kulcs"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "�rv�nytelen argumentum"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "rossz URI"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "nem t�mogatott URI"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "h�l�zati hiba"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "nem titkos�tott"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "nem feldolgozott"
+
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "haszn�lhatatlan nyilv�nos kulcs"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "haszn�lhatatlan titkos kulcs"
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr "kulcsszerverhiba"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "Ez egy programhiba... (%s:%d:%s)\n"
+
+#: util/logger.c:285
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
+
+#: cipher/random.c:163
+msgid "no entropy gathering module detected\n"
+msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
+
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: cipher/random.c:391
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
+
+#: cipher/random.c:396
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "\"%s\" nem szab�lyos �llom�ny. Figyelmen k�v�l hagyom.\n"
+
+#: cipher/random.c:401
+msgid "note: random_seed file is empty\n"
+msgstr ""
+"Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
+
+#: cipher/random.c:407
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
+
+#: cipher/random.c:415
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: cipher/random.c:453
+msgid "note: random_seed file not updated\n"
+msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
+
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: cipher/random.c:480
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: cipher/random.c:483
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#: cipher/random.c:728
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
+
+#: cipher/random.c:729
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"A v�letlensz�m-gener�tor csak egy sz�ks�gmegold�s, hogy a program\n"
+"elinduljon, semmik�ppen nem egy er�s v�letlensz�m-gener�tor!\n"
+"\n"
+"NE HASZN�LJON SEMMILYEN ADATOT, AMIT EZ A PROGRAM EL��LL�T!\n"
+"\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Nem �ll rendelkez�sre el�g v�letlen b�jt. K�rem, csin�ljon most valami\n"
+"m�st, hogy az oper�ci�s rendszer entr�pi�t gy�jthessen!\n"
+"(M�g %d b�jt sz�ks�ges.)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "\"%s\" kivonatol� algoritmus csak olvashat� ebben a kiad�sban\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"K�rem, v�rjon, entr�pi�t gy�jt�k! Vagy ink�bb csin�ljon k�zben valamit\n"
+"a g�pen, az az entr�pi�m min�s�g�t is jav�tani fogja!\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
+
+#: g10/g10.c:354
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Parancsok:\n"
+" "
+
+#: g10/g10.c:356
+msgid "|[file]|make a signature"
+msgstr "|[f�jl]|al��r�s k�sz�t�se"
+
+#: g10/g10.c:357
+msgid "|[file]|make a clear text signature"
+msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
+
+#: g10/g10.c:358
+msgid "make a detached signature"
+msgstr "k�l�n�ll� al��r�s k�sz�t�se"
+
+#: g10/g10.c:359
+msgid "encrypt data"
+msgstr "adat titkos�t�sa"
+
+#: g10/g10.c:361
+msgid "encryption only with symmetric cipher"
+msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
+
+#: g10/g10.c:363
+msgid "decrypt data (default)"
+msgstr "adat visszafejt�se (alap�rtelmez�s)"
+
+#: g10/g10.c:365
+msgid "verify a signature"
+msgstr "al��r�s ellen�rz�se"
+
+#: g10/g10.c:367
+msgid "list keys"
+msgstr "kulcsok list�z�sa"
+
+#: g10/g10.c:369
+msgid "list keys and signatures"
+msgstr "kulcsok �s al��r�sok list�z�sa"
+
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "kulcsal��r�sok ellen�rz�se"
+
+#: g10/g10.c:371
+msgid "list keys and fingerprints"
+msgstr "kulcsok �s ujjlenyomatok list�z�sa"
+
+#: g10/g10.c:372
+msgid "list secret keys"
+msgstr "titkos kulcsok list�z�sa"
+
+#: g10/g10.c:373
+msgid "generate a new key pair"
+msgstr "�j kulcsp�r l�trehoz�sa"
+
+#: g10/g10.c:374
+msgid "remove keys from the public keyring"
+msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
+
+#: g10/g10.c:376
+msgid "remove keys from the secret keyring"
+msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
+
+#: g10/g10.c:377
+msgid "sign a key"
+msgstr "kulcs al��r�sa"
+
+#: g10/g10.c:378
+msgid "sign a key locally"
+msgstr "kulcs al��r�sa helyileg"
+
+#: g10/g10.c:381
+msgid "sign or edit a key"
+msgstr "kulcs al��r�sa vagy szerkeszt�se"
+
+#: g10/g10.c:382
+msgid "generate a revocation certificate"
+msgstr "visszavon�si igazol�s k�sz�t�se"
+
+#: g10/g10.c:384
+msgid "export keys"
+msgstr "kulcsok export�l�sa"
+
+#: g10/g10.c:385
+msgid "export keys to a key server"
+msgstr "kulcsok export�l�sa kulcsszerverre"
+
+#: g10/g10.c:386
+msgid "import keys from a key server"
+msgstr "kulcsok import�l�sa kulcsszerverr�l"
+
+#: g10/g10.c:388
+msgid "search for keys on a key server"
+msgstr "kulcsok keres�se kulcsszerveren"
+
+#: g10/g10.c:390
+msgid "update all keys from a keyserver"
+msgstr "minden kulcs friss�t�se kulcsszerverr�l"
+
+#: g10/g10.c:393
+msgid "import/merge keys"
+msgstr "kulcsok import�l�sa/�sszef�z�se"
+
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
+
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
+
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
+
+#: g10/g10.c:406
+msgid "update the trust database"
+msgstr "bizalmi adatb�zis friss�t�se"
+
+#: g10/g10.c:413
+msgid "|algo [files]|print message digests"
+msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
+
+#: g10/g10.c:417 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opci�k:\n"
+" "
+
+#: g10/g10.c:419
+msgid "create ascii armored output"
+msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
+
+#: g10/g10.c:421
+msgid "|NAME|encrypt for NAME"
+msgstr "|N�V|titkos�t�s N�V r�sz�re"
+
+#: g10/g10.c:432
+msgid "use this user-id to sign or decrypt"
+msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
+
+#: g10/g10.c:433
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
+
+#: g10/g10.c:438
+msgid "use canonical text mode"
+msgstr "kanonikus sz�veges m�d haszn�lata"
+
+#: g10/g10.c:448
+msgid "use as output file"
+msgstr "kimeneti �llom�ny megad�sa"
+
+#: g10/g10.c:450 g10/gpgv.c:66
+msgid "verbose"
+msgstr "b�besz�d� m�d"
+
+#: g10/g10.c:461
+msgid "do not make any changes"
+msgstr "ne csin�ljon semmi v�ltoztat�st"
+
+#: g10/g10.c:462
+msgid "prompt before overwriting"
+msgstr "fel�l�r�s el�tt r�k�rdez�s"
+
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
+
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:535
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
+
+#: g10/g10.c:538
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"P�ld�k:\n"
+"\n"
+" -se -r Bob [f�jl]          titkos�t�s �s al��r�s Bob r�sz�re\n"
+" --clearsign [f�jl]         olvashat� sz�veg al��r�sa\n"
+" --detach-sign [f�jl]       k�l�n�ll� al��r�s k�sz�t�se\n"
+" --list-keys [nevek]        kulcsok ki�rat�sa\n"
+" --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
+
+#: g10/g10.c:713 g10/gpgv.c:91
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
+
+#: g10/g10.c:730
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
+
+#: g10/g10.c:733
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Szintaxis: gpg [opci�k] [f�jlok]\n"
+"Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
+"Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
+
+#: g10/g10.c:744
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"T�mogatott algoritmusok:\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Nyilv�nos kulcs� (pubkey): "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Rejtjelez� (cipher): "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Kivonatol� (hash): "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "T�m�r�t� (compression): "
+
+#: g10/g10.c:848
+msgid "usage: gpg [options] "
+msgstr "Haszn�lat: gpg [opci�k] "
+
+#: g10/g10.c:951
+msgid "conflicting commands\n"
+msgstr "Egym�snak ellentmond� parancsok!\n"
+
+#: g10/g10.c:969
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
+
+#: g10/g10.c:1601
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
+
+#: g10/g10.c:1637
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
+
+#: g10/g10.c:1641
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "\"%s\" opci�s f�jl: %s\n"
+
+#: g10/g10.c:1648
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
+
+#: g10/g10.c:1887
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
+
+#: g10/g10.c:2099
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
+
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: �rv�nytelen export opci�k!\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "�rv�nytelen export opci�k!\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: �rv�nytelen import opci�k!\n"
+
+#: g10/g10.c:2137
+msgid "invalid import options\n"
+msgstr "�rv�nytelen import opci�k!\n"
+
+#: g10/g10.c:2144
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: �rv�nytelen export opci�k!\n"
+
+#: g10/g10.c:2147
+msgid "invalid export options\n"
+msgstr "�rv�nytelen export opci�k!\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: �rv�nytelen import opci�k!\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "�rv�nytelen import opci�k!\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: �rv�nytelen export opci�k!\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "�rv�nytelen export opci�k!\n"
+
+#: g10/g10.c:2208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
+
+#: g10/g10.c:2398
+msgid "WARNING: program may create a core file!\n"
+msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
+
+#: g10/g10.c:2402
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
+
+#: g10/g10.c:2411
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
+
+#: g10/g10.c:2414
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s �rtelmetlen %s mellett!\n"
+
+#: g10/g10.c:2435
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
+
+#: g10/g10.c:2441
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
+
+#: g10/g10.c:2447
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
+
+#: g10/g10.c:2460
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
+
+#: g10/g10.c:2528 g10/g10.c:2552
+msgid "selected cipher algorithm is invalid\n"
+msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
+
+#: g10/g10.c:2534 g10/g10.c:2558
+msgid "selected digest algorithm is invalid\n"
+msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
+
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
+
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
+
+#: g10/g10.c:2561
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
+
+#: g10/g10.c:2563
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
+
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
+
+#: g10/g10.c:2572
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
+
+#: g10/g10.c:2576
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
+
+#: g10/g10.c:2583
+msgid "invalid default preferences\n"
+msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
+
+#: g10/g10.c:2592
+msgid "invalid personal cipher preferences\n"
+msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
+
+#: g10/g10.c:2596
+msgid "invalid personal digest preferences\n"
+msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
+
+#: g10/g10.c:2600
+msgid "invalid personal compress preferences\n"
+msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
+
+#: g10/g10.c:2778
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
+
+#: g10/g10.c:2789
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+"FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
+
+#: g10/g10.c:2800
+msgid "--store [filename]"
+msgstr "--store [f�jln�v]"
+
+#: g10/g10.c:2807
+msgid "--symmetric [filename]"
+msgstr "--symmetric [f�jln�v]"
+
+#: g10/g10.c:2819
+msgid "--encrypt [filename]"
+msgstr "--encrypt [f�jln�v]"
+
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [f�jln�v]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
+
+#: g10/g10.c:2855
+msgid "--sign [filename]"
+msgstr "--sign [f�jln�v]"
+
+#: g10/g10.c:2868
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [f�jln�v]"
+
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [f�jln�v]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
+
+#: g10/g10.c:2908
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [f�jln�v]"
+
+#: g10/g10.c:2917
+msgid "--clearsign [filename]"
+msgstr "--clearsign [f�jln�v]"
+
+#: g10/g10.c:2942
+msgid "--decrypt [filename]"
+msgstr "--decrypt [f�jln�v]"
+
+#: g10/g10.c:2950
+msgid "--sign-key user-id"
+msgstr "--sign-key felh-azonos�t�"
+
+#: g10/g10.c:2954
+msgid "--lsign-key user-id"
+msgstr "--lsign-key felh-azonos�t�"
+
+#: g10/g10.c:2958
+msgid "--nrsign-key user-id"
+msgstr "--nrsign-key felh-azonos�t�"
+
+#: g10/g10.c:2962
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key felh-azonos�t�"
+
+#: g10/g10.c:2986
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key felh-azonos�t� [parancsok]"
+
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "Nem tudom megnyitni %s-t: %s\n"
+
+#: g10/g10.c:3057
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
+
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "Kulcsexport�l�s sikertelen: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
+
+#: g10/g10.c:3160
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
+
+#: g10/g10.c:3168
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "P�nc�loz�s nem siker�lt: %s\n"
+
+#: g10/g10.c:3255
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
+
+#: g10/g10.c:3378
+msgid "[filename]"
+msgstr "[f�jln�v]"
+
+#: g10/g10.c:3382
+msgid "Go ahead and type your message ...\n"
+msgstr "Kezdheti g�pelni az �zenetet...\n"
+
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "Nem tudom megnyitni %s-t!\n"
+
+#: g10/g10.c:3659
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
+"jellel kell befejez�dj�n.\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+
+#: g10/g10.c:3678
+msgid "a notation value must not use any control characters\n"
+msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
+
+#: g10/g10.c:3712
+msgid "the given certification policy URL is invalid\n"
+msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
+
+#: g10/g10.c:3714
+msgid "the given signature policy URL is invalid\n"
+msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "m�g sz�kszav�bb m�d"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "a megadott kulcskarik�r�l vegye a kulcsokat"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Szintaxis: gpg [opci�k] [f�jlok]\n"
+"Ellen�rzi az al��r�sokat az ismert, megb�zhat� kulcsok seg�ts�g�vel.\n"
+
+#: g10/armor.c:317
+#, c-format
+msgid "armor: %s\n"
+msgstr "P�nc�l: %s\n"
+
+#: g10/armor.c:346
+msgid "invalid armor header: "
+msgstr "�rv�nytelen p�nc�lfejl�c: "
+
+#: g10/armor.c:353
+msgid "armor header: "
+msgstr "P�nc�lfejl�c: "
+
+#: g10/armor.c:364
+msgid "invalid clearsig header\n"
+msgstr "�rv�nytelen al��r�sfejl�c!\n"
+
+#: g10/armor.c:416
+msgid "nested clear text signatures\n"
+msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
+
+#: g10/armor.c:553
+msgid "invalid dash escaped line: "
+msgstr "�rv�nytelen k�t�jeles sor: "
+
+#: g10/armor.c:565
+msgid "unexpected armor:"
+msgstr "V�ratlan p�nc�l:"
+
+#: g10/armor.c:695 g10/armor.c:1276
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
+
+#: g10/armor.c:738
+msgid "premature eof (no CRC)\n"
+msgstr "Korai �llom�nyv�g (nincs CRC).\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in CRC)\n"
+msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
+
+#: g10/armor.c:776
+msgid "malformed CRC\n"
+msgstr "Hib�s form�j� CRC.\n"
+
+#: g10/armor.c:780 g10/armor.c:1313
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "CRC hiba; %06lx - %06lx\n"
+
+#: g10/armor.c:800
+msgid "premature eof (in Trailer)\n"
+msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
+
+#: g10/armor.c:804
+msgid "error in trailer line\n"
+msgstr "Hiba a z�r� sorban!\n"
+
+#: g10/armor.c:1091
+msgid "no valid OpenPGP data found.\n"
+msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
+
+#: g10/armor.c:1096
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
+
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
+
+#: g10/pkclist.c:61 g10/revoke.c:576
+msgid "No reason specified"
+msgstr "Nincs megadva ok."
+
+#: g10/pkclist.c:63 g10/revoke.c:578
+msgid "Key is superseded"
+msgstr "A kulcsot lecser�lt�k."
+
+#: g10/pkclist.c:65 g10/revoke.c:577
+msgid "Key has been compromised"
+msgstr "A kulcs kompromitt�l�dott."
+
+#: g10/pkclist.c:67 g10/revoke.c:579
+msgid "Key is no longer used"
+msgstr "A kulcs m�r nem haszn�latos."
+
+#: g10/pkclist.c:69 g10/revoke.c:580
+msgid "User ID is no longer valid"
+msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
+
+#: g10/pkclist.c:73
+msgid "reason for revocation: "
+msgstr "Visszavon�s oka: "
+
+#: g10/pkclist.c:90
+msgid "revocation comment: "
+msgstr "Megjegyz�s a visszavon�shoz: "
+
+#: g10/pkclist.c:195
+msgid "iImMqQsS"
+msgstr "iIfFkKhH"
+
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
+msgstr ""
+"Nincs megb�zhat�s�gi �rt�k rendelve:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "               azaz \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "               azaz \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+"K�rem, d�ntse el, hogy mennyire b�zik meg ebben a felhaszn�l�ban,\n"
+"hogy megfelel�en ellen�rzi m�sok kulcsait (�tlevelek ellen�rz�s�vel,\n"
+"k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
+"\n"
+
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = Nem tudom\n"
+
+#: g10/pkclist.c:252
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = NEM b�zom benne\n"
+
+#: g10/pkclist.c:254
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = r�szlegesen megb�zom benne\n"
+
+#: g10/pkclist.c:256
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = teljesen megb�zom benne\n"
+
+#: g10/pkclist.c:258
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = alapvet�en megb�zom benne\n"
+
+#: g10/pkclist.c:261
+msgid " i = please show me more information\n"
+msgstr " i = tov�bbi inform�ci�kat k�rek\n"
+
+#: g10/pkclist.c:264
+msgid " m = back to the main menu\n"
+msgstr " f = visszat�r�s a f�men�be\n"
+
+#: g10/pkclist.c:267
+msgid " s = skip this key\n"
+msgstr " h = kulcs kihagy�sa\n"
+
+#: g10/pkclist.c:268
+msgid " q = quit\n"
+msgstr " k = kil�p�s\n"
+
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
+msgid "Your decision? "
+msgstr "Mit v�laszt? "
+
+#: g10/pkclist.c:299
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "T�nyleg be akarja �ll�tani ezt a kulcsot alapvet�en megb�zhat�ra? "
+
+#: g10/pkclist.c:313
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Alapvet�en megb�zhat� kulcshoz vezet� igazol�sok:\n"
+
+#: g10/pkclist.c:387
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "%08lX kulcs vissza lett vonva!\n"
+
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
+msgid "Use this key anyway? "
+msgstr "M�gis haszn�ljuk ezt a kulcsot? "
+
+#: g10/pkclist.c:399
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "%08lX alkulcs vissza lett vonva!\n"
+
+#: g10/pkclist.c:420
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX kulcs lej�rt!\n"
+
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: Ebben a kulcsban NEM b�zunk.\n"
+
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
+
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "Ez a kulcs val�sz�n�leg a jelzett tulajdonoshoz tartozik.\n"
+
+#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "Ez a kulcs hozz�nk tartozik.\n"
+
+#: g10/pkclist.c:500
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+"NEM biztos, hogy a kulcs a felhaszn�l�i azonos�t�ban szerepl�\n"
+"szem�lyhez tartozik. Ha �n *val�ban* tudja, hogy mit csin�l,\n"
+"a k�vetkez� k�rd�sre v�laszolhat igennel.\n"
+"\n"
+
+#: g10/pkclist.c:514 g10/pkclist.c:544
+msgid "WARNING: Using untrusted key!\n"
+msgstr "FIGYELEM: Nem b�zunk a kulcsban, amit haszn�lunk!\n"
+
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "FIGYELEM: a kulcsot visszavonhatt�k (visszavon� kulcs nincs jelen).\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
+
+#: g10/pkclist.c:563
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
+
+#: g10/pkclist.c:564
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         Ez jelentheti azt, hogy az al��r�s hamis.\n"
+
+#: g10/pkclist.c:570
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
+
+#: g10/pkclist.c:575
+msgid "Note: This key has been disabled.\n"
+msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
+
+#: g10/pkclist.c:580
+msgid "Note: This key has expired!\n"
+msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
+
+#: g10/pkclist.c:591
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"          Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
+
+#: g10/pkclist.c:601
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
+
+#: g10/pkclist.c:602
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         Az al��r�s val�sz�n�leg HAMIS.\n"
+
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
+
+#: g10/pkclist.c:612
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: kihagyva: %s\n"
+
+#: g10/pkclist.c:787 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
+
+#: g10/pkclist.c:829
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr ""
+"Nem adott meg felhaszn�l�i azonos�t�t! (Haszn�lhatja a \"-r\" opci�t.)\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+"\n"
+"Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
+
+#: g10/pkclist.c:887
+msgid "No such user ID.\n"
+msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
+
+#: g10/pkclist.c:892 g10/pkclist.c:954
+msgid "skipped: public key already set as default recipient\n"
+msgstr ""
+"Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva alap�rtelmezett c�mzettnek.\n"
+
+#: g10/pkclist.c:910
+msgid "Public key is disabled.\n"
+msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
+
+#: g10/pkclist.c:917
+msgid "skipped: public key already set\n"
+msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
+
+#: g10/pkclist.c:946
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+
+#: g10/pkclist.c:991
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
+
+#: g10/pkclist.c:1046
+msgid "no valid addressees\n"
+msgstr "Nincsenek �rv�nyes c�mzettek!\n"
+
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "%c%lu preferencia k�tszer szerepel!\n"
+
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "T�l sok \"%c\" preferencia.\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "T�l sok \"%c\" preferencia.\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "T�l sok \"%c\" preferencia.\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
+
+#: g10/keygen.c:738
+msgid "writing direct signature\n"
+msgstr "Sima al��r�st �rok.\n"
+
+#: g10/keygen.c:777
+msgid "writing self signature\n"
+msgstr "�nal��r�st �rok.\n"
+
+#: g10/keygen.c:823
+msgid "writing key binding signature\n"
+msgstr "�sszef�z� al��r�st �rok.\n"
+
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
+
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
+
+#: g10/keygen.c:1165
+msgid "Please select what kind of key you want:\n"
+msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
+
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
+
+#: g10/keygen.c:1168
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (csak al��r�s)\n"
+
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
+
+#: g10/keygen.c:1171
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (csak al��r�s)\n"
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (csak titkos�t�s)\n"
+
+#: g10/keygen.c:1175
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (al��r�s �s titkos�t�s)\n"
+
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+msgid "Your selection? "
+msgstr "Mit v�laszt? "
+
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+msgid "Invalid selection.\n"
+msgstr "�rv�nytelen v�laszt�s.\n"
+
+#: g10/keygen.c:1225
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Most egy �j %s kulcsp�rt hozunk l�tre.\n"
+"           minim�lis kulcsm�ret:  768 bit\n"
+"     alap�rtelmezett kulcsm�ret: 1024 bit\n"
+" legnagyobb aj�nlott kulcsm�ret: 2048 bit\n"
+
+#: g10/keygen.c:1234
+msgid "What keysize do you want? (1024) "
+msgstr "Milyen kulcsm�retet szeretne? (1024) "
+
+#: g10/keygen.c:1239
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "A DSA csak 512 �s 1024 k�z�tti kulcsm�retet t�mogat.\n"
+
+#: g10/keygen.c:1241
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "Kulcsm�ret t�l kicsi; 1024 a legkisebb megengedett �rt�k RSA-hoz.\n"
+
+#: g10/keygen.c:1244
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "Kulcsm�ret t�l kicsi; 768 a legkisebb megengedett �rt�k.\n"
+
+#: g10/keygen.c:1255
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "Kulcsm�ret t�l nagy; %d a legnagyobb megengedett �rt�k.\n"
+
+#: g10/keygen.c:1260
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"2048-n�l nagyobb kulcsm�ret nem aj�nlott, mert a sz�m�t�sok\n"
+"NAGYON sok�ig fognak tartani!\n"
+
+#: g10/keygen.c:1263
+msgid "Are you sure that you want this keysize? "
+msgstr "Biztos benne, hogy akarja ezt a kulcsm�retet? "
+
+#: g10/keygen.c:1264
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Rendben, de vegye figyelembe, hogy a t�mad�k a monitor�nak vagy\n"
+"a billenty�zet�nek a sug�rz�s�t is felhaszn�lhatj�k!\n"
+
+#: g10/keygen.c:1273
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "A k�v�nt kulcsm�ret %u bit.\n"
+
+#: g10/keygen.c:1276 g10/keygen.c:1280
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "Felkerek�tve %u bitre.\n"
+
+#: g10/keygen.c:1331
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+"K�rem, adja meg, meddig legyen �rv�nyes a kulcs!\n"
+"         0 = a kulcs soha nem j�r le\n"
+"      <n>  = a kulcs n napig �rv�nyes\n"
+"      <n>w = a kulcs n h�tig �rv�nyes\n"
+"      <n>m = a kulcs n h�napig �rv�nyes\n"
+"      <n>y = a kulcs n �vig �rv�nyes\n"
+
+#: g10/keygen.c:1340
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"K�rem, adja meg, meddig legyen �rv�nyes az al��r�s!\n"
+"         0 = az al��r�s soha nem j�r le\n"
+"      <n>  = az al��r�s n napig �rv�nyes\n"
+"      <n>w = az al��r�s n h�tig �rv�nyes\n"
+"      <n>m = az al��r�s n h�napig �rv�nyes\n"
+"      <n>y = az al��r�s n �vig �rv�nyes\n"
+
+#: g10/keygen.c:1362
+msgid "Key is valid for? (0) "
+msgstr "Meddig �rv�nyes a kulcs? (0) "
+
+#: g10/keygen.c:1364
+msgid "Signature is valid for? (0) "
+msgstr "Meddig �rv�nyes az al��r�s? (0) "
+
+#: g10/keygen.c:1369
+msgid "invalid value\n"
+msgstr "�rv�nytelen �rt�k!\n"
+
+#: g10/keygen.c:1374
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr "%s soha nem j�r le.\n"
+
+#: g10/keygen.c:1381
+#, c-format
+msgid "%s expires at %s\n"
+msgstr "%s lej�r: %s\n"
+
+#: g10/keygen.c:1387
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Az �n rendszere nem tud megjelen�teni 2038 ut�ni d�tumokat.\n"
+"Azonban kezelni helyesen tudja �ket eg�szen 2106-ig.\n"
+
+#: g10/keygen.c:1392
+msgid "Is this correct (y/n)? "
+msgstr "Ez �gy helyes (i/n)? "
+
+#: g10/keygen.c:1435
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"Sz�ks�ge lesz egy felhaszn�l�i azonos�t�ra a kulcsa azonos�t�s�hoz;\n"
+"a szoftver ezt a teljes n�vb�l, megjegyz�sb�l �s e-mail c�mb�l �ll�tja\n"
+"el� a k�vetkez� form�ban:\n"
+"    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
+"\n"
+
+#: g10/keygen.c:1447
+msgid "Real name: "
+msgstr "Teljes n�v: "
+
+#: g10/keygen.c:1455
+msgid "Invalid character in name\n"
+msgstr "�rv�nytelen karakter a n�vben!\n"
+
+#: g10/keygen.c:1457
+msgid "Name may not start with a digit\n"
+msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
+
+#: g10/keygen.c:1459
+msgid "Name must be at least 5 characters long\n"
+msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
+
+#: g10/keygen.c:1467
+msgid "Email address: "
+msgstr "E-mail c�m: "
+
+#: g10/keygen.c:1478
+msgid "Not a valid email address\n"
+msgstr "Ez nem �rv�nyes e-mail c�m.\n"
+
+#: g10/keygen.c:1486
+msgid "Comment: "
+msgstr "Megjegyz�s: "
+
+#: g10/keygen.c:1492
+msgid "Invalid character in comment\n"
+msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
+
+#: g10/keygen.c:1515
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "�n a(z) %s karakterk�dol�st haszn�lja.\n"
+
+#: g10/keygen.c:1521
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"�n a k�vetkez� felhaszn�l�i azonos�t�t v�lasztotta:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:1526
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
+
+#: g10/keygen.c:1531
+msgid "NnCcEeOoQq"
+msgstr "NnMmEeRrKk"
+
+#: g10/keygen.c:1541
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (K)il�p�s? "
+
+#: g10/keygen.c:1542
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr ""
+"(N)�v, (M)egjegyz�s, (E)-mail megv�ltoztat�sa vagy (R)endben/(K)il�p�s? "
+
+#: g10/keygen.c:1561
+msgid "Please correct the error first\n"
+msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
+
+#: g10/keygen.c:1600
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
+"\n"
+
+#: g10/keygen.c:1609 g10/keyedit.c:1021
+msgid "passphrase not correctly repeated; try again"
+msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
+
+#: g10/keygen.c:1610
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:1616
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway.  You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"�n nem akar jelsz�t. Ez val�sz�n�leg egy *rossz* �tlet!\n"
+"De az�rt megcsin�lom. B�rmikor megv�ltoztathatja a jelszav�t\n"
+"az \"--edit-key\" opci�val.\n"
+"\n"
+
+#: g10/keygen.c:1638
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Nagyon sok v�letlen b�jtra van sz�ks�g�nk. J� �tlet, ha csin�l valami\n"
+"egy�b m�veletet (g�pel a billenty�zeten, mozgatja az egeret, haszn�lja\n"
+"a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
+"gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "Sajn�lom, ezt nem tudom megcsin�lni k�tegelt m�dban!\n"
+
+#: g10/keygen.c:2267
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
+
+#: g10/keygen.c:2335
+msgid "Key generation canceled.\n"
+msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
+
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "�rom a kulcsot a %s �llom�nyba.\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#: g10/keygen.c:2565
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
+
+#: g10/keygen.c:2571
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
+
+#: g10/keygen.c:2589
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
+
+#: g10/keygen.c:2596
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
+
+#: g10/keygen.c:2619
+msgid "public and secret key created and signed.\n"
+msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
+
+#: g10/keygen.c:2630
+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 ""
+"Ez a kulcs nem haszn�lhat� titkos�t�sra. Ha egy m�sodlagos kulcsot\n"
+"k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
+"teheti meg.\n"
+
+#: g10/keygen.c:2642 g10/keygen.c:2755
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Kulcsgener�l�s sikertelen: %s\n"
+
+#: g10/keygen.c:2691 g10/sign.c:290
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+
+#: g10/keygen.c:2693 g10/sign.c:292
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+
+#: g10/keygen.c:2702
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr ""
+"MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
+
+#: g10/keygen.c:2730
+msgid "Really create? "
+msgstr "Val�ban l�trehozzam? "
+
+#: g10/decrypt.c:98 g10/encode.c:845
+msgid "--output doesn't work for this command\n"
+msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
+
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s-t nem tudom megnyitni: %s.\n"
+
+#: g10/encode.c:203 g10/sign.c:1144
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
+#: g10/encode.c:208
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
+
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "%s rejtjelez�st haszn�lok.\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "\"%s\" m�r t�m�r�tett.\n"
+
+#: g10/encode.c:301 g10/encode.c:590
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "FIGYELEM: \"%s\" �res �llom�ny.\n"
+
+#: g10/encode.c:465
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr ""
+"Csak 2048 bites, vagy r�videbb RSA kulcsokkal titkos�that --pgp2 m�dban!\n"
+
+#: g10/encode.c:480
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "Olvasok a \"%s\" �llom�nyb�l.\n"
+
+#: g10/encode.c:516
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr "Nem tudom az IDEA rejtjelez�t haszn�lni az �sszes c�mzett kulcshoz.\n"
+
+#: g10/encode.c:526 g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
+
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
+
+#: g10/encode.c:818
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
+
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
+
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
+
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
+
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
+
+#: g10/export.c:385
+msgid "WARNING: nothing exported\n"
+msgstr "FIGYELEM: Semmit sem export�ltam.\n"
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
+
+#: g10/getkey.c:186 g10/getkey.c:2693
+msgid "[User id not found]"
+msgstr "[ismeretlen kulcs]"
+
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+"%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
+"--allow-non-selfsigned-uid opci�val.\n"
+
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+"Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
+
+#: g10/import.c:241
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "%d t�pus� blokkot kihagyom.\n"
+
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
+
+#: g10/import.c:255
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#: g10/import.c:267
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "     �sszesen feldolgoztam: %lu\n"
+
+#: g10/import.c:269
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "       �j kulcsok kihagyva: %lu\n"
+
+#: g10/import.c:272
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "    felh. azonos�t� n�lk�l: %lu\n"
+
+#: g10/import.c:274
+#, c-format
+msgid "              imported: %lu"
+msgstr "                import�lva: %lu"
+
+#: g10/import.c:280
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "               v�ltozatlan: %lu\n"
+
+#: g10/import.c:282
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "       �j felh. azonos�t�k: %lu\n"
+
+#: g10/import.c:284
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "              �j alkulcsok: %lu\n"
+
+#: g10/import.c:286
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "              �j al��r�sok: %lu\n"
+
+#: g10/import.c:288
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "     �j kulcsvisszavon�sok: %lu\n"
+
+#: g10/import.c:290
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "   olvasott titkos kulcsok: %lu\n"
+
+#: g10/import.c:292
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "  import�lt titkos kulcsok: %lu\n"
+
+#: g10/import.c:294
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr "v�ltozatlan titkos kulcsok: %lu\n"
+
+#: g10/import.c:296
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr "             nem import�lt: %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
+
+#: g10/import.c:755
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
+
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "�rok a \"%s\" �llom�nyba.\n"
+
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
+
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
+
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
+
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
+
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
+
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
+
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
+
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
+
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
+
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr ""
+"%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
+
+#: g10/import.c:1064
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
+
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
+
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
+
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
+
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
+
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
+
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr ""
+"%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
+"azonos�t�n!\n"
+
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
+
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
+
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
+
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
+
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
+
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
+
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
+
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
+
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
+
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
+
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
+
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
+
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
+
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
+
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr ""
+"FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
+"leh�vom a %08lX visszavon� kulcsot.\n"
+
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr ""
+"FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
+"visszavon� kulcs (%08lX) nincs jelen.\n"
+
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
+
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
+
+#: g10/keyedit.c:159
+msgid "[revocation]"
+msgstr "[visszavon�s]"
+
+#: g10/keyedit.c:160
+msgid "[self-signature]"
+msgstr "[�nal��r�s]"
+
+#: g10/keyedit.c:237 g10/keylist.c:319
+msgid "1 bad signature\n"
+msgstr "1 rossz al��r�s.\n"
+
+#: g10/keyedit.c:239 g10/keylist.c:321
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d rossz al��r�s.\n"
+
+#: g10/keyedit.c:241 g10/keylist.c:323
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
+
+#: g10/keyedit.c:243 g10/keylist.c:325
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
+
+#: g10/keyedit.c:245 g10/keylist.c:327
+msgid "1 signature not checked due to an error\n"
+msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
+
+#: g10/keyedit.c:247 g10/keylist.c:329
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
+
+#: g10/keyedit.c:249
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
+
+#: g10/keyedit.c:251
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = r�szlegesen megb�zom benne\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = teljesen megb�zom benne\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
+
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
+msgid "  Unable to sign.\n"
+msgstr "  Nem tudom al��rni.\n"
+
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
+
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
+
+#: g10/keyedit.c:584
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"\"%s\" �nal��r�sa\n"
+"PGP 2.x st�lus�.\n"
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
+"kulcson lej�rt.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
+
+#: g10/keyedit.c:632
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
+"kulcson helyi al��r�s.\n"
+
+#: g10/keyedit.c:636
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
+
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
+
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
+
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "M�g egyszer al� akarja �rni? (i/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
+
+#: g10/keyedit.c:702
+msgid "This key has expired!"
+msgstr "Ez a kulcs lej�rt!"
+
+#: g10/keyedit.c:722
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "Ez a kulcs lej�r: %s.\n"
+
+#: g10/keyedit.c:726
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
+
+#: g10/keyedit.c:759
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
+
+#: g10/keyedit.c:761
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
+
+#: g10/keyedit.c:786
+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 ""
+"Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
+"a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
+
+#: g10/keyedit.c:791
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr "   (0) Nem v�laszolok.%s\n"
+
+#: g10/keyedit.c:793
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
+
+#: g10/keyedit.c:795
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
+
+#: g10/keyedit.c:797
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
+
+#: g10/keyedit.c:826
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
+"az �n kulcs�val: \""
+
+#: g10/keyedit.c:835
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"\n"
+"Ez egy �nal��r�s lesz.\n"
+
+#: g10/keyedit.c:839
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
+
+#: g10/keyedit.c:844
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
+
+#: g10/keyedit.c:851
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
+
+#: g10/keyedit.c:855
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
+
+#: g10/keyedit.c:860
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+"\n"
+"Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
+
+#: g10/keyedit.c:864
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+"\n"
+"A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
+
+#: g10/keyedit.c:868
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+"\n"
+"Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
+
+#: g10/keyedit.c:877
+msgid "Really sign? "
+msgstr "Val�ban al��rja? "
+
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "Al��r�s sikertelen: %s\n"
+
+#: g10/keyedit.c:978
+msgid "This key is not protected.\n"
+msgstr "Ez a kulcs nem v�dett.\n"
+
+#: g10/keyedit.c:982
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
+
+#: g10/keyedit.c:986
+msgid "Key is protected.\n"
+msgstr "A kulcs v�dett.\n"
+
+#: g10/keyedit.c:1006
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
+
+#: g10/keyedit.c:1012
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
+"\n"
+
+#: g10/keyedit.c:1026
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
+"\n"
+
+#: g10/keyedit.c:1029
+msgid "Do you really want to do this? "
+msgstr "Val�ban ezt akarja? "
+
+#: g10/keyedit.c:1095
+msgid "moving a key signature to the correct place\n"
+msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
+
+#: g10/keyedit.c:1138
+msgid "quit this menu"
+msgstr "kil�p�s ebb�l a men�b�l"
+
+#: g10/keyedit.c:1139
+msgid "q"
+msgstr "q"
+
+#: g10/keyedit.c:1140
+msgid "save"
+msgstr "save"
+
+#: g10/keyedit.c:1140
+msgid "save and quit"
+msgstr "ment�s �s kil�p�s"
+
+#: g10/keyedit.c:1141
+msgid "help"
+msgstr "help"
+
+#: g10/keyedit.c:1141
+msgid "show this help"
+msgstr "megmutatja ezt a s�g�t"
+
+#: g10/keyedit.c:1143
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:1143
+msgid "show fingerprint"
+msgstr "megmutatja az ujjlenyomatot"
+
+#: g10/keyedit.c:1144
+msgid "list"
+msgstr "list"
+
+#: g10/keyedit.c:1144
+msgid "list key and user IDs"
+msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
+
+#: g10/keyedit.c:1145
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:1146
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:1146
+msgid "select user ID N"
+msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
+
+#: g10/keyedit.c:1147
+msgid "key"
+msgstr "key"
+
+#: g10/keyedit.c:1147
+msgid "select secondary key N"
+msgstr "N. m�sodlagos kulcs kiv�laszt�sa"
+
+#: g10/keyedit.c:1148
+msgid "check"
+msgstr "check"
+
+#: g10/keyedit.c:1148
+msgid "list signatures"
+msgstr "al��r�sok kilist�z�sa"
+
+#: g10/keyedit.c:1149
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:1150
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:1150
+msgid "sign the key"
+msgstr "kulcs al��r�sa"
+
+#: g10/keyedit.c:1151
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "k�l�n�ll� al��r�s k�sz�t�se"
+
+#: g10/keyedit.c:1153
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:1153
+msgid "sign the key locally"
+msgstr "kulcs helyi al��r�sa"
+
+#: g10/keyedit.c:1154
+msgid "nrsign"
+msgstr "nrsign"
+
+#: g10/keyedit.c:1154
+msgid "sign the key non-revocably"
+msgstr "kulcs nem visszavonhat� al��r�sa"
+
+#: g10/keyedit.c:1155
+msgid "nrlsign"
+msgstr "nrlsign"
+
+#: g10/keyedit.c:1155
+msgid "sign the key locally and non-revocably"
+msgstr "kulcs nem visszavonhat� helyi al��r�sa"
+
+#: g10/keyedit.c:1156
+msgid "debug"
+msgstr "debug"
+
+#: g10/keyedit.c:1157
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:1157
+msgid "add a user ID"
+msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
+
+#: g10/keyedit.c:1158
+msgid "addphoto"
+msgstr "addphoto"
+
+#: g10/keyedit.c:1158
+msgid "add a photo ID"
+msgstr "fot�azonos�t� hozz�ad�sa"
+
+#: g10/keyedit.c:1159
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:1159
+msgid "delete user ID"
+msgstr "felhaszn�l�i azonos�t� t�rl�se"
+
+#: g10/keyedit.c:1161
+msgid "delphoto"
+msgstr "delphoto"
+
+#: g10/keyedit.c:1162
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1162
+msgid "add a secondary key"
+msgstr "m�sodlagos kulcs (alkulcs) hozz�ad�sa"
+
+#: g10/keyedit.c:1163
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:1163
+msgid "delete a secondary key"
+msgstr "m�sodlagos kulcs t�rl�se"
+
+#: g10/keyedit.c:1164
+msgid "addrevoker"
+msgstr "addrevoker"
+
+#: g10/keyedit.c:1164
+msgid "add a revocation key"
+msgstr "visszavon� kulcs hozz�ad�sa"
+
+#: g10/keyedit.c:1165
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:1165
+msgid "delete signatures"
+msgstr "al��r�sok t�rl�se"
+
+#: g10/keyedit.c:1166
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:1166
+msgid "change the expire date"
+msgstr "lej�rat megv�ltoztat�sa"
+
+#: g10/keyedit.c:1167
+msgid "primary"
+msgstr "primary"
+
+#: g10/keyedit.c:1167
+msgid "flag user ID as primary"
+msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
+
+#: g10/keyedit.c:1168
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:1168
+msgid "toggle between secret and public key listing"
+msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
+
+#: g10/keyedit.c:1170
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:1171
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:1171
+msgid "list preferences (expert)"
+msgstr "preferenci�k list�z�sa (szak�rt�)"
+
+#: g10/keyedit.c:1172
+msgid "showpref"
+msgstr "showpref"
+
+#: g10/keyedit.c:1172
+msgid "list preferences (verbose)"
+msgstr "preferenci�k list�z�sa (r�szletes)"
+
+#: g10/keyedit.c:1173
+msgid "setpref"
+msgstr "setpref"
+
+#: g10/keyedit.c:1173
+msgid "set preference list"
+msgstr "preferencialista be�ll�t�sa"
+
+#: g10/keyedit.c:1174
+msgid "updpref"
+msgstr "updpref"
+
+#: g10/keyedit.c:1174
+msgid "updated preferences"
+msgstr "preferenci�k friss�t�se"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "kulcsszerverhiba"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
+
+#: g10/keyedit.c:1176
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:1176
+msgid "change the passphrase"
+msgstr "jelsz�v�ltoztat�s"
+
+#: g10/keyedit.c:1177
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:1177
+msgid "change the ownertrust"
+msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
+
+#: g10/keyedit.c:1178
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:1178
+msgid "revoke signatures"
+msgstr "al��r�sok visszavon�sa"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "felhaszn�l�i azonos�t� visszavon�sa"
+
+#: g10/keyedit.c:1180
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:1180
+msgid "revoke a secondary key"
+msgstr "m�sodlagos kulcs visszavon�sa"
+
+#: g10/keyedit.c:1181
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:1181
+msgid "disable a key"
+msgstr "kulcs tilt�sa"
+
+#: g10/keyedit.c:1182
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:1182
+msgid "enable a key"
+msgstr "kulcs enged�lyez�se"
+
+#: g10/keyedit.c:1183
+msgid "showphoto"
+msgstr "showphoto"
+
+#: g10/keyedit.c:1183
+msgid "show photo ID"
+msgstr "fot�azonos�t� megmutat�sa"
+
+#: g10/keyedit.c:1202 g10/delkey.c:120
+msgid "can't do that in batchmode\n"
+msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
+
+#: g10/keyedit.c:1233
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
+
+#: g10/keyedit.c:1250
+msgid "Secret key is available.\n"
+msgstr "Titkos kulcs rendelkez�sre �ll.\n"
+
+#: g10/keyedit.c:1282
+msgid "Command> "
+msgstr "Parancs> "
+
+#: g10/keyedit.c:1312
+msgid "Need the secret key to do this.\n"
+msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
+
+#: g10/keyedit.c:1316
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
+
+#: g10/keyedit.c:1364
+msgid "Key is revoked."
+msgstr "A kulcsot visszavont�k."
+
+#: g10/keyedit.c:1383
+msgid "Really sign all user IDs? "
+msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
+
+#: g10/keyedit.c:1384
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
+
+#: g10/keyedit.c:1409
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
+
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+msgid "You must select at least one user ID.\n"
+msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
+
+#: g10/keyedit.c:1433
+msgid "You can't delete the last user ID!\n"
+msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
+
+#: g10/keyedit.c:1436
+msgid "Really remove all selected user IDs? "
+msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
+
+#: g10/keyedit.c:1437
+msgid "Really remove this user ID? "
+msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
+
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
+msgid "You must select at least one key.\n"
+msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
+
+#: g10/keyedit.c:1478
+msgid "Do you really want to delete the selected keys? "
+msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
+
+#: g10/keyedit.c:1479
+msgid "Do you really want to delete this key? "
+msgstr "Val�ban t�rli ezt a kulcsot? "
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
+
+#: g10/keyedit.c:1534
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
+
+#: g10/keyedit.c:1535
+msgid "Do you really want to revoke this key? "
+msgstr "Val�ban visszavonja ezt a kulcsot? "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "preferencialista be�ll�t�sa"
+
+#: g10/keyedit.c:1612
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
+
+#: g10/keyedit.c:1614
+msgid "Really update the preferences? "
+msgstr "Val�ban friss�tsem a preferenci�kat? "
+
+#: g10/keyedit.c:1662
+msgid "Save changes? "
+msgstr "Mentsem a v�ltoztat�sokat? "
+
+#: g10/keyedit.c:1665
+msgid "Quit without saving? "
+msgstr "Kil�pjek ment�s n�lk�l? "
+
+#: g10/keyedit.c:1675
+#, c-format
+msgid "update failed: %s\n"
+msgstr "Friss�t�s sikertelen: %s.\n"
+
+#: g10/keyedit.c:1682
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
+
+#: g10/keyedit.c:1689
+msgid "Key not changed so no update needed.\n"
+msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
+
+#: g10/keyedit.c:1701
+msgid "Invalid command  (try \"help\")\n"
+msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Kivonat: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Jellemz�k: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr " (�rz�keny)"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "%s nem hozhat� l�tre: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[visszavont] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [lej�r: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [lej�r: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " bizalom: %c/%c"
+
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
+msgid "This key has been disabled"
+msgstr "Ez a kulcs tiltott."
+
+#: g10/keyedit.c:2146
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! Alkulcsot visszavont�k: %s.\n"
+
+#: g10/keyedit.c:2149
+msgid "rev- faked revocation found\n"
+msgstr "rev- Hamis visszavon�st tal�ltam!\n"
+
+#: g10/keyedit.c:2151
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[visszavont] "
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
+
+#: g10/keyedit.c:2207
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
+"felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[visszavont] "
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[lej�rt]     "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
+" azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
+
+#: g10/keyedit.c:2399
+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 ""
+"FIGYELEM: Ez egy PGP2 st�lus� kulcs. Fot�azonos�t� hozz�ad�sa azt "
+"okozhatja,\n"
+"          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
+
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
+
+#: g10/keyedit.c:2410
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
+
+#: g10/keyedit.c:2545
+msgid "Delete this good signature? (y/N/q)"
+msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
+
+#: g10/keyedit.c:2555
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
+
+#: g10/keyedit.c:2559
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
+
+#: g10/keyedit.c:2565
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
+
+#: g10/keyedit.c:2579
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "T�r�ltem %d al��r�st.\n"
+
+#: g10/keyedit.c:2580
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "T�r�ltem %d al��r�st.\n"
+
+#: g10/keyedit.c:2583
+msgid "Nothing deleted.\n"
+msgstr "Nem t�r�ltem semmit.\n"
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"FIGYELEM: Ez egy PGP 2.x st�lus� kulcs. Kijel�lt visszavon� hozz�ad�sa\n"
+"          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
+"kulcsot!\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+"Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
+
+#: g10/keyedit.c:2703
+msgid "Enter the user ID of the designated revoker: "
+msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
+
+#: g10/keyedit.c:2726
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
+
+#: g10/keyedit.c:2741
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+"FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
+
+#: g10/keyedit.c:2849
+msgid "Please remove selections from the secret keys.\n"
+msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
+
+#: g10/keyedit.c:2855
+msgid "Please select at most one secondary key.\n"
+msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
+
+#: g10/keyedit.c:2859
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
+
+#: g10/keyedit.c:2862
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
+
+#: g10/keyedit.c:2908
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
+
+#: g10/keyedit.c:2924
+msgid "No corresponding signature in secret ring\n"
+msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
+
+#: g10/keyedit.c:3004
+msgid "Please select exactly one user ID.\n"
+msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
+
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
+
+#: g10/keyedit.c:3377
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "Nincs %d index� m�sodlagos kulcs!\n"
+
+#: g10/keyedit.c:3491
+msgid "user ID: \""
+msgstr "Felhaszn�l�azonos�t�: \""
+
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
+
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"Helyileg al��rva az �n %08lX kulcs�val %s id�pontban.\n"
+
+#: g10/keyedit.c:3504
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
+
+#: g10/keyedit.c:3508
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
+
+#: g10/keyedit.c:3512
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
+
+#: g10/keyedit.c:3537
+msgid "You have signed these user IDs:\n"
+msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
+
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
+
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
+
+#: g10/keyedit.c:3587
+msgid "You are about to revoke these signatures:\n"
+msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
+
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr "   al��rva %08lX �ltal %s%s id�pontban.\n"
+
+#: g10/keyedit.c:3599
+msgid " (non-exportable)"
+msgstr " (nem export�lhat�)"
+
+#: g10/keyedit.c:3606
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
+
+#: g10/keyedit.c:3636
+msgid "no secret key\n"
+msgstr "Nincs titkos kulcs.\n"
+
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+"FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
+
+#: g10/keylist.c:179
+msgid "Critical signature policy: "
+msgstr "Kritikus al��r�si elj�r�sm�d: "
+
+#: g10/keylist.c:181
+msgid "Signature policy: "
+msgstr "Al��r�si elj�r�sm�d: "
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
+msgid "WARNING: invalid notation data found\n"
+msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
+
+#: g10/keylist.c:286
+msgid "Critical signature notation: "
+msgstr "Kritikus al��r�s-jel�l�s: "
+
+#: g10/keylist.c:288
+msgid "Signature notation: "
+msgstr "Al��r�s-jel�l�s: "
+
+#: g10/keylist.c:299
+msgid "not human readable"
+msgstr "nem olvashat� forma"
+
+#: g10/keylist.c:400
+msgid "Keyring"
+msgstr "Kulcskarika"
+
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [lej�r: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
+msgid " [expires: %s]"
+msgstr " [lej�r: %s]"
+
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[visszavont] "
+
+#: g10/keylist.c:1357
+msgid "Primary key fingerprint:"
+msgstr "Els�dlegeskulcs-ujjlenyomat:"
+
+#: g10/keylist.c:1359
+msgid "     Subkey fingerprint:"
+msgstr "         Alkulcsujjlenyomat:"
+
+#: g10/keylist.c:1366
+msgid " Primary key fingerprint:"
+msgstr "Els�dlegeskulcs-ujjlenyomat:"
+
+#: g10/keylist.c:1368
+msgid "      Subkey fingerprint:"
+msgstr "         Alkulcsujjlenyomat:"
+
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr " Kulcs ujjlenyomata ="
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
+
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "Rossz jelsz� vagy ismeretlen rejtjelez� algoritmus (%d).\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s titkos�tott munkafolyamatkulcs\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s titkos�tott adat.\n"
+
+#: g10/mainproc.c:305 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
+
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "Nyilv�nos kulcs: %08lX\n"
+
+#: g10/mainproc.c:428
+msgid "public key encrypted data: good DEK\n"
+msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
+
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
+
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
+
+#: g10/mainproc.c:486
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
+
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "%lu jelsz�val rejtjelezve\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "1 jelsz�val rejtjelezve\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s titkos�tott adatot felt�telezek.\n"
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr ""
+"IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
+"%s-t haszn�lni helyette.\n"
+
+#: g10/mainproc.c:570
+msgid "decryption okay\n"
+msgstr "Visszafejt�s rendben.\n"
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
+
+#: g10/mainproc.c:587
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
+
+#: g10/mainproc.c:593
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "Visszafejt�s sikertelen: %s.\n"
+
+#: g10/mainproc.c:613
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
+
+#: g10/mainproc.c:615
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "Eredeti f�jln�v: '%.*s'.\n"
+
+#: g10/mainproc.c:787
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr ""
+"K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
+
+#: g10/mainproc.c:1283
+msgid "signature verification suppressed\n"
+msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
+
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
+msgid "can't handle these multiple signatures\n"
+msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
+
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Az al��r�s lej�rt: %s.\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "               azaz \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Kulcs tal�lhat�: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
+msgid "Expired signature from \""
+msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
+
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
+msgid "Good signature from \""
+msgstr "J� al��r�s a k�vetkez�t�l: \""
+
+#: g10/mainproc.c:1510
+msgid "[uncertain]"
+msgstr "[bizonytalan]"
+
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "               azaz \""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Az al��r�s lej�rt: %s.\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Az al��r�s lej�r: %s.\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "Bin�ris"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "Sz�vegm�d�"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "Ismeretlen m�d�"
+
+#: g10/mainproc.c:1668
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
+
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
+msgid "not a detached signature\n"
+msgstr "Nem k�l�n�ll� al��r�s.\n"
+
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
+
+#: g10/mainproc.c:1787
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
+
+#: g10/mainproc.c:1844
+msgid "old style (PGP 2.x) signature\n"
+msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
+
+#: g10/mainproc.c:1854
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
+
+#: g10/misc.c:82
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
+
+#: g10/misc.c:146
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Nem szabadna k�s�rleti algoritmusokat haszn�lni!\n"
+
+#: g10/misc.c:176
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+"Ez a rejtjelez� algoritmus nem aj�nlott. K�rem, haszn�ljon szabv�nyosabbat!\n"
+
+#: g10/misc.c:282
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
+
+#: g10/misc.c:283
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"Tov�bbi inform�ci�t a http://www.gnupg.org/why-not-idea.html oldalon tal�l.\n"
+
+#: g10/misc.c:491
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: Elavult opci�: \"%s\"\n"
+
+#: g10/misc.c:495
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+
+#: g10/misc.c:497
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "t�m�r�tetlen"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "t�m�r�tetlen"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
+
+#: g10/parse-packet.c:120
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
+
+#: g10/parse-packet.c:1128
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
+
+#: g10/passphrase.c:461 g10/passphrase.c:508
+msgid "gpg-agent is not available in this session\n"
+msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
+
+#: g10/passphrase.c:469
+msgid "can't set client pid for the agent\n"
+msgstr "Nem tudom be�ll�tani a kliens pid-et az �gyn�knek.\n"
+
+#: g10/passphrase.c:477
+msgid "can't get server read FD for the agent\n"
+msgstr "Nem tudom lek�rni a szerver olvas�si �llom�nyle�r�j�t az �gyn�knek.\n"
+
+#: g10/passphrase.c:484
+msgid "can't get server write FD for the agent\n"
+msgstr "Nem tudom lek�rni a szerver �r�si �llom�nyle�r�j�t az �gyn�knek.\n"
+
+#: g10/passphrase.c:517
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
+
+#: g10/passphrase.c:530
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
+
+#: g10/passphrase.c:551
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
+
+#: g10/passphrase.c:573
+msgid "communication problem with gpg-agent\n"
+msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
+
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+msgid "problem with the agent - disabling agent use\n"
+msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
+
+#: g10/passphrase.c:681
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+" \n"
+"  (f� kulcsazonos�t�: %08lX)"
+
+#: g10/passphrase.c:691
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Most meg kell adnia a jelsz�t, mellyel a k�vetkez� felhaszn�l�\n"
+"titkos kulcsa haszn�latba vehet�:\n"
+"\"%.*s\"\n"
+"%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
+
+#: g10/passphrase.c:713
+msgid "Repeat passphrase\n"
+msgstr "Ism�telje meg a jelsz�t!\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "�rja be a jelsz�t!\n"
+
+#: g10/passphrase.c:753
+msgid "passphrase too long\n"
+msgstr "A jelsz� t�l hossz�!\n"
+
+#: g10/passphrase.c:766
+msgid "invalid response from agent\n"
+msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
+
+#: g10/passphrase.c:781 g10/passphrase.c:874
+msgid "cancelled by user\n"
+msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
+
+#: g10/passphrase.c:786 g10/passphrase.c:963
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "�rja be a jelsz�t: "
+
+#: g10/passphrase.c:1131
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Jelsz�ra van sz�ks�ge a k�vetkez� felhaszn�l� titkos kulcs�nak "
+"haszn�lat�hoz:\n"
+"\""
+
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
+
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr ""
+" \n"
+"  (f� kulcsazonos�t�: %08lX)"
+
+#: g10/passphrase.c:1213
+msgid "Repeat passphrase: "
+msgstr "Ism�telje meg a jelsz�t: "
+
+#: g10/plaintext.c:90
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr ""
+"Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
+
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
+
+#: g10/plaintext.c:438
+msgid "Detached signature.\n"
+msgstr "K�l�n�ll� al��r�s.\n"
+
+#: g10/plaintext.c:442
+msgid "Please enter name of data file: "
+msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
+
+#: g10/plaintext.c:463
+msgid "reading stdin ...\n"
+msgstr "Olvasom a szabv�nyos bemenetet...\n"
+
+#: g10/plaintext.c:497
+msgid "no signed data\n"
+msgstr "Nincs al��rt adat.\n"
+
+#: g10/plaintext.c:505
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
+
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "Anonim c�mzett. A %08lX titkos kulcsot pr�b�lom...\n"
+
+#: g10/pubkey-enc.c:119
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "Rendben, mi vagyunk az anonim c�mzett.\n"
+
+#: g10/pubkey-enc.c:207
+msgid "old encoding of the DEK is not supported\n"
+msgstr "A DEK r�gi k�dol�sa nem t�mogatott.\n"
+
+#: g10/pubkey-enc.c:228
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "A %d%s rejtjelez� algoritmus ismeretlen vagy tiltott.\n"
+
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "MEGJEGYZ�S: %d rejtjelez� algoritmus nincs a preferenci�k k�z�tt.\n"
+
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
+
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
+
+#: g10/seckey-cert.c:60
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
+
+#: g10/seckey-cert.c:250
+msgid "Invalid passphrase; please try again"
+msgstr "�rv�nytelen jelsz�. Pr�b�lja �jra"
+
+#: g10/seckey-cert.c:251
+#, c-format
+msgid "%s ...\n"
+msgstr "%s...\n"
+
+#: g10/seckey-cert.c:311
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr ""
+"FIGYELEM: Gyenge kulcsot tal�ltam. K�rem, v�ltoztassa meg ism�t a jelsz�t!\n"
+
+#: g10/seckey-cert.c:349
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+"Elavult, 16 bites ellen�rz��sszeget hozok l�tre titkos kulcs v�delm�hez.\n"
+
+#: g10/sig-check.c:75
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "FIGYELEM: Al��r�skivonat-konfliktus az �zenetben.\n"
+
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "FIGYELEM: %08lX al��r� alkulcson �rv�nytelen kereszthiteles�t�s van.\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
+
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
+
+#: g10/sig-check.c:180
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+
+#: g10/sig-check.c:182
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
+
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "MEGJEGYZ�S: Al��r� kulcs (%08lX) lej�rt: %s\n"
+
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"Rossz al��r�st felt�telezek a %08lX kulcst�l egy ismeretlen\n"
+"kritikus bit miatt.\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "%08lX kulcs: Nincs alkulcs az alkulcsk�t� al��r�shoz!\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "Nem tehet jel�l�adatot a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
+
+#: g10/sign.c:112
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"FIGYELEM: Nem tudom kifejteni a %% jeleket a jel�l�sben (t�l hossz�).\n"
+"Kifejt�s n�lk�l haszn�lom.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) al��r�sokba!\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"Nem tehet elj�r�sm�d-URL-t a v3-as (PGP 2.x st�lus�) kulcsal��r�sokba!\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"FIGYELEM: Nem tudom kifejteni a %% jeleket az elj�r�sm�d URL-ben (t�l "
+"hossz�).\n"
+"Kifejt�s n�lk�l haszn�lom.\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"FIGYELEM: Nem tudom kifejteni a %% jeleket az elj�r�sm�d URL-ben (t�l "
+"hossz�).\n"
+"Kifejt�s n�lk�l haszn�lom.\n"
+
+#: g10/sign.c:364
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
+
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
+
+#: g10/sign.c:550
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
+
+#: g10/sign.c:741
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
+
+#: g10/sign.c:765 g10/sign.c:1001
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "%s nem hozhat� l�tre: %s\n"
+
+#: g10/sign.c:794
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
+"a c�mzett preferenci�ival.\n"
+
+#: g10/sign.c:886
+msgid "signing:"
+msgstr "Al��rom:"
+
+#: g10/sign.c:985
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
+
+#: g10/sign.c:1138
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s titkos�t�st fogok haszn�lni.\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "Nem tudok %d karaktern�l hosszabb sz�vegsorokat kezelni!\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
+
+#: g10/tdbio.c:128 g10/tdbio.c:1434
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
+
+#: g10/tdbio.c:134 g10/tdbio.c:1441
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "Bizalmi adatb�zis %lu. rekord: �r�s sikertelen (n=%d): %s.\n"
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
+
+#: g10/tdbio.c:497
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: Nem tudom el�rni: %s.\n"
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: K�nyvt�r nem l�tezik!\n"
+
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: Nem tudok lock-ot l�trehozni.\n"
+
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: Nem tudok lock-ot csin�lni.\n"
+
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: Nem tudom l�trehozni: %s.\n"
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
+
+#: g10/tdbio.c:549
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
+
+#: g10/tdbio.c:552
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
+
+#: g10/tdbio.c:592
+msgid "NOTE: trustdb not writable\n"
+msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
+
+#: g10/tdbio.c:608
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
+
+#: g10/tdbio.c:640
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
+
+#: g10/tdbio.c:648
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
+
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
+
+#: g10/tdbio.c:1163
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
+
+#: g10/tdbio.c:1171
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
+
+#: g10/tdbio.c:1192
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: Nem bizalmi adatb�zis.\n"
+
+#: g10/tdbio.c:1210
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
+
+#: g10/tdbio.c:1215
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
+
+#: g10/tdbio.c:1400
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
+
+#: g10/tdbio.c:1408
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
+
+#: g10/tdbio.c:1418
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: Nem siker�lt egy rekord null�z�sa: %s.\n"
+
+#: g10/tdbio.c:1448
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: Nem siker�lt egy rekord hozz�ad�sa: %s.\n"
+
+#: g10/tdbio.c:1493
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "Bizalmi adatb�zis s�r�lt. K�rem, futtassa: \"gpg --fix-trustdb\".\n"
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "\"%s\" nem egy �rv�nyes hossz� kulcsazonos�t�.\n"
+
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "%08lX kulcs: Elfogadva megb�zhat� kulcsk�nt.\n"
+
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "A(z) %08lX kulcs egyn�l t�bbsz�r szerepel a bizalmi adatb�zisban.\n"
+
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr ""
+"%08lX kulcs: Nincs nyilv�nos kulcs a megb�zhat� kulcshoz - kihagytam.\n"
+
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "A kulcsot alapvet�en megb�zhat�nak jel�ltem.\n"
+
+#: g10/trustdb.c:344
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "%lu bizalmi rekord, %d k�r�st�pus: olvas�s sikertelen: %s.\n"
+
+#: g10/trustdb.c:350
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
+
+#: g10/trustdb.c:365 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
+
+#: g10/trustdb.c:380 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "soha      "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
+msgid "no need for a trustdb check\n"
+msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
+
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
+
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"Nem tudom ellen�rizni az al��r�st.\n"
+"Ne felejtse el, hogy az al��r�st tartalmaz� �llom�nyt (.sig vagy .asc)\n"
+"kell az els� helyre �rni a parancssorban!\n"
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "A bemeneti sor (%u) t�l hossz�, vagy hi�nyzik a soremel�s.\n"
+
+#: 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 kulcs nincs \"nem biztons�gosnak\" jel�lve,\n"
+"nem tudom a p�tl� v�letlensz�m-gener�torral haszn�lni!\n"
+
+#: g10/skclist.c:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "Kihagytam \"%s\"-t: %s.\n"
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
+
+#: g10/skclist.c:179
+#, fuzzy, c-format
+msgid ""
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
+"biztons�gos al��r�sokhoz!\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "\"%s\" �llom�ny l�tezik. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Fel�l�rjam (i/N)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: ismeretlen v�gz�d�s.\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "�rja be az �j �llom�nynevet"
+
+#: g10/openfile.c:183
+msgid "writing to stdout\n"
+msgstr "�rok a szabv�nyos kimenetre.\n"
+
+#: g10/openfile.c:282
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "Azt felt�telezem, hogy az al��rt adat a %s �llom�nyban van.\n"
+
+#: g10/openfile.c:349
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "\"%s\" �j konfigur�ci�s �llom�nyt l�trehoztam.\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
+
+#: g10/openfile.c:380
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: K�nyvt�rat l�trehoztam.\n"
+
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"FIGYELEM: Az �zenet szimmetrikus titkos�t�s�t gyenge kulccsal v�gezt�k.\n"
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr "Probl�ma a titkos�tott csomag kezel�sekor!\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "Gyenge kulcs j�tt l�tre. �jrapr�b�lom.\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr ""
+"Nem tudom elker�lni a gyenge kulcsot a szimmetrikus titkos�t�hoz.\n"
+"%d alkalommal pr�b�ltam!\n"
+
+#: g10/seskey.c:210
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "A DSA 160 bites hash (kivonatol�) algoritmust ig�nyel.\n"
+
+#: g10/delkey.c:121 g10/delkey.c:128
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(Kiv�ve, ha megad egy kulcsot az ujjlenyomat�val.)\n"
+
+#: g10/delkey.c:127
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban \"--yes\" n�lk�l.\n"
+
+#: g10/delkey.c:139
+msgid "Delete this key from the keyring? "
+msgstr "T�r�ljem ezt a kulcsot a kulcskarik�r�l? "
+
+#: g10/delkey.c:147
+msgid "This is a secret key! - really delete? "
+msgstr "Ez egy titkos kulcs! Val�ban t�r�ljem? "
+
+#: g10/delkey.c:157
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: g10/delkey.c:167
+msgid "ownertrust information cleared\n"
+msgstr "Kulcstulajdonos megb�zhat�s�gi adatait t�r�ltem.\n"
+
+#: g10/delkey.c:195
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
+
+#: g10/delkey.c:197
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
+
+#: g10/helptext.c:48
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Az �n d�nt�s�n m�lik, hogy milyen �rt�ket ad meg itt. Ezt az �rt�ket soha\n"
+"nem export�ljuk m�sok r�sz�re. Ez a bizalmak h�l�zat�hoz (web-of-trust)\n"
+"sz�ks�ges, semmi k�ze az igazol�sok h�l�zat�hoz (web-of-certificates)."
+
+#: g10/helptext.c:54
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"Hogy a bizalmak h�l�zat�t fel�p�ts�k, a GnuPG-nek tudnia kell, hogy\n"
+"mely kulcsok alapvet�en megb�zhat�ak - �ltal�ban ezek azok a kulcsok,\n"
+"melyek titkos kulcs�hoz hozz�f�r. V�laszoljon \"igen\"-nel, ha kulcsot\n"
+"alapvet�en megb�zhat�nak jel�li!\n"
+
+#: g10/helptext.c:61
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr ""
+"Ha m�gis haszn�lni akarja ezt a visszavont kulcsot,\n"
+"v�laszoljon \"igen\"-nel!"
+
+#: g10/helptext.c:65
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+"Ha m�gis haszn�lni akarja ezt a kulcsot, melyben nem b�zunk,\n"
+"v�laszoljon \"igen\"-nel!"
+
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Adja meg a c�mzett felhaszn�l�i azonos�t�j�t!"
+
+#: g10/helptext.c:73
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+
+#: g10/helptext.c:87
+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 ""
+"�ltal�ban nem j� �tlet ugyanazt a kulcsot haszn�lni al��r�shoz �s\n"
+"titkos�t�shoz. Ezt az algoritmust csak bizonyos ter�leteken aj�nlatos\n"
+"haszn�lni. K�rem, el�sz�r konzult�ljon a biztons�gi szak�rt�j�vel!"
+
+#: g10/helptext.c:94
+msgid "Enter the size of the key"
+msgstr "Adja meg a kulcs m�ret�t!"
+
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
+msgid "Answer \"yes\" or \"no\""
+msgstr "K�rem, adjon \"igen\" vagy \"nem\" v�laszt!"
+
+#: g10/helptext.c:108
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Adja meg a sz�ks�ges �rt�ket, ahogy a prompt mutatja!\n"
+"Lehets�ges ISO d�tumot is be�rni (����-HH-NN), de nem fog rendes\n"
+"hiba�zenetet kapni, hanem a rendszer megpr�b�lja az �rt�ket\n"
+"intervallumk�nt �rtelmezni."
+
+#: g10/helptext.c:120
+msgid "Enter the name of the key holder"
+msgstr "Adja meg a kulcs tulajdonos�nak a nev�t!"
+
+#: g10/helptext.c:125
+msgid "please enter an optional but highly suggested email address"
+msgstr "K�rem, adjon meg egy opcion�lis, de nagyon aj�nlott e-mail c�met!"
+
+#: g10/helptext.c:129
+msgid "Please enter an optional comment"
+msgstr "K�rem, adjon meg egy opcion�lis megjegyz�st!"
+
+#: g10/helptext.c:134
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N  n�v v�ltoztat�sa\n"
+"M  megjegyz�s v�ltoztat�sa\n"
+"E  e-mail v�ltoztat�sa\n"
+"R  kulcsgener�l�s folytat�sa\n"
+"Q  kil�p�s a kulcsgener�l�sb�l"
+
+#: g10/helptext.c:143
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr ""
+"V�laszoljon \"igen\"-nel (vagy csak \"i\"-vel), ha kezdhetj�k az alkulcs\n"
+"l�trehoz�s�t!"
+
+#: g10/helptext.c:151
+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"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"Miel�tt al��r egy felhaszn�l�i azonos�t�t egy kulcson, ellen�riznie kell,\n"
+"hogy a kulcs a felhaszn�l�i azonos�t�ban megnevezett szem�lyhez tartozik.\n"
+"M�sok sz�m�ra hasznos lehet, ha tudj�k, hogy milyen gondosan ellen�rizte\n"
+"�n ezt.\n"
+"\n"
+"\"0\" azt jelenti, hogy nem tesz az ellen�rz�s gondoss�g�ra vonatkoz�\n"
+"    kijelent�st.\n"
+"\n"
+"\"1\" azt jelenti, hogy �n hiszi, hogy a kulcs annak a szem�lynek a\n"
+"    tulajdona, aki azt �ll�tja, hogy az �v�, de �n nem tudta ezt\n"
+"    ellen�rizni, vagy egyszer�en nem ellen�rizte ezt. Ez hasznos egy\n"
+"    \"persona\" t�pus� ellen�rz�shez, mikor �n egy pszeudonim felhaszn�l�\n"
+"    kulcs�t �rja al�.\n"
+"\n"
+"\"2\" azt jelenti, hogy �n a kulcsot h�tk�znapi alaposs�ggal ellen�rizte.\n"
+"    P�ld�ul ez azt jelentheti, hogy ellen�rizte a kulcs ujjlenyomat�t, �s\n"
+"    �sszevetette a kulcson szerepl� felhaszn�l�azonos�t�t egy f�nyk�pes\n"
+"    igazolv�nnyal.\n"
+"\n"
+"\"3\" azt jelenti, hogy alaposan ellen�rizte a kulcsot. P�ld�ul ez azt\n"
+"    jelentheti, hogy a kulcs ujjlenyomat�t a tulajdonossal szem�lyesen\n"
+"    tal�lkozva ellen�rizte, egy nehezen hamis�that�, f�nyk�pes "
+"igazolv�nnyal\n"
+"    (mint az �tlev�l) meggy�z�d�tt arr�l, hogy a szem�ly neve egyezik a\n"
+"    kulcson lev�vel, �s v�g�l (e-mail v�lt�ssal) ellen�rizte, hogy a "
+"kulcson\n"
+"    szerepl� e-mail c�m a kulcs tulajdonos�hoz tartozik.\n"
+"\n"
+"A 2-es �s 3-as szintekhez adott p�ld�k *csak* p�ld�k. V�gs� soron �n d�nti\n"
+"el, hogy mit jelentenek �nnek a \"h�tk�znapi\" �s \"alapos\" kifejez�sek,\n"
+"amikor m�sok kulcs�t al��rja.\n"
+"\n"
+"Ha nem tudja, hogy mit v�laszoljon, �rjon \"0\"-t!"
+
+#: g10/helptext.c:189
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr ""
+"V�laszoljon \"igen\"-nel, ha az �SSZES felhaszn�l�azonos�t�t al� akarja �rni!"
+
+#: g10/helptext.c:193
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"V�laszoljon \"igen\"-nel, ha val�ban t�r�lni akarja ezt a "
+"felhaszn�l�azonos�t�t!\n"
+"Minden igazol�s t�rl�dik vele egy�tt!"
+
+#: g10/helptext.c:198
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "V�laszoljon \"igen\"-nel, ha az alkulcs t�r�lhet�."
+
+#: g10/helptext.c:203
+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 ""
+"Ez egy �rv�nyes al��r�s a kulcson. Norm�l esetben nincs �rtelme\n"
+"t�r�lni, mert fontos lehet ahhoz, hogy �rv�nyes�tse ezt a kulcsot,\n"
+"vagy egy m�sikat, melyet ezzel a kulccsal igazolnak."
+
+#: g10/helptext.c:208
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"Ezt az al��r�st nem tudom ellen�rizni, mert nincs meg a hozz� tartoz�\n"
+"kulcs. Aj�nlatos lenne elhalasztani a t�rl�st addig, am�g meg nem tudja,\n"
+"hogy melyik kulcsot haszn�lt�k, mert ez az al��r� kulcs bizalmi\n"
+"kapcsolatot hozhat l�tre egy m�r hiteles�tett kulcson kereszt�l."
+
+#: g10/helptext.c:214
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr "Ez az al��r�s nem �rv�nyes. �rtelmetlen elt�vol�tani a kulcskarik�r�l."
+
+#: g10/helptext.c:218
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"Ez egy olyan al��r�s, amely �sszek�ti a felhaszn�l�azonos�t�t\n"
+"a kulccsal. �ltal�ban nem j� �tlet egy ilyen al��r�st elt�vol�tani.\n"
+"Az is lehets�ges, hogy a GnuPG t�bb� nem tudja haszn�lni ezt\n"
+"a kulcsot. Csak akkor tegye ezt, ha valami okb�l ez az �nal��r�s nem\n"
+"�rv�nyes, �s rendelkez�sre �ll egy m�sik!"
+
+#: g10/helptext.c:226
+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 ""
+"Lecser�li az �sszes felhaszn�l�azonos�t�hoz (vagy csak a kijel�ltekhez)\n"
+"tartoz� preferenci�kat az aktu�lis preferenci�kra. Minden �rintett\n"
+"�nal��r�s id�pontj�t egy m�sodperccel n�veli.\n"
+
+#: g10/helptext.c:233
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+
+#: g10/helptext.c:239
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "K�rem, ism�telje meg az el�z� jelsz�t ellen�rz�sk�ppen!"
+
+#: g10/helptext.c:243
+msgid "Give the name of the file to which the signature applies"
+msgstr "Adja meg az �llom�ny nev�t, melyhez az al��r�s tartozik!"
+
+#: g10/helptext.c:248
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "V�laszoljon \"igen\"-nel, ha fel�l�rhat� az �llom�ny!"
+
+#: g10/helptext.c:253
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"K�rem, adjon meg egy �j f�jlnevet! Ha RETURN-t/ENTER-t nyom, akkor\n"
+"a sz�gletes z�r�jelben lev� alap�rtelmezett nevet haszn�lom."
+
+#: g10/helptext.c:259
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"Aj�nlatos megadni a visszavon�s ok�t. A helyzett�l f�gg�en v�lasszon\n"
+"a k�vetkez� list�b�l:\n"
+"  \"A kulcs kompromitt�l�dott.\"\n"
+"      Haszn�lja ezt akkor, ha oka van azt hinni, hogy titkos kulcsa\n"
+"      illet�ktelen kezekbe ker�lt!\n"
+"  \"A kulcsot lecser�lt�k.\"\n"
+"      Haszn�lja ezt akkor, ha a kulcsot lecser�lte egy �jabbra!\n"
+"  \"A kulcs m�r nem haszn�latos.\"\n"
+"      Haszn�lja ezt akkor, ha m�r nem haszn�lja a kulcsot!\n"
+"  \"A felhaszn�l�azonos�t� m�r nem �rv�nyes.\"\n"
+"      Haszn�lja ezt akkor, ha azt �ll�tja, hogy a felhaszn�l�azonos�t�\n"
+"      m�r nem haszn�latos! �ltal�ban �rv�nytelen e-mail c�met jelent.\n"
+
+#: g10/helptext.c:275
+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 ""
+"Ha akarja, megadhat egy sz�veget, melyben megindokolja, hogy mi�rt\n"
+"adta ki ezt a visszavon� igazol�st. K�rem, fogalmazzon t�m�ren!\n"
+"Egy �res sor jelzi a sz�veg v�g�t.\n"
+
+#: g10/helptext.c:290
+msgid "No help available"
+msgstr "Nem �ll rendelkez�sre seg�ts�g."
+
+#: g10/helptext.c:298
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
+
+#: g10/keydb.c:189
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+
+#: g10/keydb.c:196
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
+
+#: g10/keydb.c:615
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
+
+#: g10/keyring.c:1236
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "FIGYELEM: 2 bizalmas inform�ci�kat tartalmaz� �llom�ny van!\n"
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s az eredeti p�ld�ny.\n"
+
+#: g10/keyring.c:1239
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s az �j p�ld�ny.\n"
+
+#: g10/keyring.c:1240
+msgid "Please fix this possible security flaw\n"
+msgstr "K�rem, oldja meg ezt a lehets�ges biztons�gi probl�m�t!\n"
+
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: Kulcskarik�t l�trehoztam.\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"V�lasszon egy k�pet a fot�azonos�t�j�hoz! A k�p JPEG form�tum� legyen!\n"
+"Eml�keztetj�k, hogy a k�p a nyilv�nos kulcs�ban t�rol�dik. Ha nagyon nagy\n"
+"k�pet haszn�l, a kulcsa is nagyon nagy lesz!\n"
+"A 240x288 k�r�li k�pm�ret j�l haszn�lhat�.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Adja meg egy JPEG f�jl nev�t a fot�azonos�t�hoz: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Nem tudom megnyitni a \"%s\" fot�t: %s.\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" nem JPEG �llom�ny.\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Ez a fot� megfelel� (i/N/k)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "K�ls� program megh�v�sa nem t�mogatott.\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"A k�ls� programok h�v�sa tiltott, mert az \"options\" �llom�ny enged�lyei\n"
+"nem biztons�gosak.\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"Ez a platform �tmeneti �llom�nyokat ig�nyel k�ls� programok h�v�s�hoz.\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "Rendszerhiba k�ls� program h�v�sakor: %s.\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "A k�ls� program nem term�szetes m�don �rt v�get.\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "Nem tudom a v�grehajtani a k�ls� programot.\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "Nem tudom beolvasni a k�ls� program v�lasz�t: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+"FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "soha      "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet sikertelen: %s.\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Visszavonja:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet sikertelen: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Visszavon� igazol�s l�trehozva.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "Ismeretlen v�delmi algoritmus!\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"A visszavon� igazol�st l�trehoztam.\n"
+"\n"
+"K�rem, tegye olyan helyre, ahol m�s nem f�r hozz�! Ha valaki megszerzi\n"
+"ezt az igazol�st, haszn�lhatatlann� teheti vele az �n kulcs�t. Okos dolog\n"
+"kinyomtatni �s meg�rizni ezt az igazol�st, arra az esetre, ha az\n"
+"adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
+"rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "M�gsem"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Visszavon�s oka: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Nincs le�r�s.)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Ez �gy rendben van? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Meghat�rozott bizalmi �rt�kek list�ja, %s.\n"
+"# (Haszn�lja a \"gpg --import-ownertrust\" parancsot a vissza�ll�t�shoz!)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "A sor t�l hossz�!\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "Hiba: Hi�nyz� kett�spont.\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "Hiba: Nincs tulajdonosmegb�zhat�s�gi �rt�k.\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "Hiba bizalmi rekord keres�sekor: %s.\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "Olvas�si hiba: %s.\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "FIGYELEM: \"%s\" kivonatol� algoritmus nem r�sze az OpenPGP-nek. Csak "
+#~ "saj�t felel�ss�g�re haszn�lja!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[f�jlok]|�llom�nyok titkos�t�sa"
+
+#~ msgid "store only"
+#~ msgstr "csak t�rol�s"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[f�jlok]|�llom�nyok visszafejt�se"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "kulcs al��r�sa visszavonhatatlanul"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "kulcs al��r�sa helyileg �s visszavonhatatlanul"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "csak a csomagok list�z�sa"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "bizalmi �rt�kek exportja"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "bizalmi �rt�kek importja"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "bizalmi adatb�zis friss�t�se fel�gyelet n�lk�l"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "s�r�lt bizalmi adatb�zis kijav�t�sa"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "p�nc�l elt�vol�t�sa �llom�nyr�l vagy bemenetr�l"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "�llom�ny vagy bemenet p�nc�loz�sa"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "ne haszn�lja a termin�lt egy�ltal�n"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "3-as verzi�j� al��r�sok er�ltet�se"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "ne er�ltesse a 3-as verzi�j� al��r�sokat"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "4-es verzi�j� al��r�sok er�ltet�se"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "ne er�ltesse a 4-es verzi�j� al��r�sokat"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "soha ne haszn�ljon MDC-t titkos�t�skor"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "gpg �gyn�k haszn�lata"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "k�tegelt m�d: soha nem k�rdez"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
+
+#~ msgid "read options from file"
+#~ msgstr "opci�k beolvas�sa �llom�nyb�l"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[f�jl]|�llapotinform�ci�k �llom�nyba �r�sa"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KULCS|alapvet�en megb�zunk ebben a kulcsban"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|f�jl|b�v�t� modul bet�lt�se"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "RFC1991-ben le�rt m�d emul�ci�ja"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "opci�k OpenPGP m�dra �ll�t�sa"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr "opci�k PGP 2.x m�dra �ll�t�sa"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|N. sorsz�m� jelsz�m�d haszn�lata"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|N�V|N�V kivonatol� algoritmus haszn. jelszavakhoz"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "titkos�tott csomagok keyid mez�j�nek eldob�sa"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "fot�azonos�t�k mutat�sa"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "ne mutassa a fot�azonos�t�kat"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "parancssor �ll�t�sa fot�azonos�t�k megn�z�s�hez"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "\"%s\" t�m�r�t�algoritmus csak olvashat� ebben a kiad�sban.\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "A t�m�r�t�algoritmus sz�ma %d �s %d k�z� kell essen!\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Nem biztos, hogy ez a kulcs val�ban a jelzett tulajdonoshoz\n"
+#~ "tartozik, ennek ellen�re elfogadtuk.\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "%c%lu preferencia �rv�nytelen!\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "%08lX kulcs: nem rfc2440 kulcs - kihagytam.\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "MEGJEGYZ�S: Elgamal els�dleges kulcsot �rz�keltem.\n"
+#~ "Eltarthat egy ideig az import�l�sa.\n"
+
+#~ msgid " (default)"
+#~ msgstr " (alap�rtelmez�s)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  l�trehozva: %s lej�r: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Jel�l�s: "
+
+#~ msgid "Policy: "
+#~ msgstr "Elj�r�sm�d: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "Nem tudom leh�vni a kulcsot a %s kulcsszerverr�l.\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "Sikeresen felk�ldtem %s kulcsszerverre. (St�tusz: %u.)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "Nem tudtam felk�ldeni %s kulcsszerverre. St�tusz: %u.\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "Ez a kulcsszerver nem t�mogatja a --search-keys kapcsol�t.\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "Nem tudok keresni a %s kulcsszerveren.\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "%08lX kulcs: Ez egy PGP �ltal l�trehozott ElGamal kulcs, mely\n"
+#~ "NEM biztons�gos al��r�sokhoz!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "%08lX kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy "
+#~ "�raprobl�ma.)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "%08lX kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy "
+#~ "�raprobl�ma.)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "A(z) %08lX kulcs alapvet�en megb�zhat�nak lett jel�lve.\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr ""
+#~ "%08lX Elgamal al��r�kulccsal %08lX kulcshoz k�sz�lt al��r�st kihagytam.\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr ""
+#~ "%08lX kulccsal %08lX Elgamal al��r�kulcshoz k�sz�lt al��r�st kihagytam.\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "Vizsg�lok a(z) %d. szinten, al��rt=%d tb(-/k/n/r/t/a)=%d/%d/%d/%d/%d/%d.\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "V�lassza ki a haszn�lni k�v�nt algoritmust!\n"
+#~ "\n"
+#~ "A DSA (m�s n�ven DSS) egy digit�lis al��r�si algoritmus, mely kiz�r�lag\n"
+#~ "al��r�sokhoz haszn�lhat�. Ez az aj�nlott algoritmus, mivel a DSA "
+#~ "al��r�sok\n"
+#~ "ellen�rz�se j�val gyorsabb az ElGamal al��r�sok�n�l.\n"
+#~ "\n"
+#~ "Az ElGamal egy algoritmus, mely al��r�sokhoz �s titkos�t�shoz is\n"
+#~ "haszn�lhat�. Az OpenPGP az algoritmus k�t fajt�j�t k�l�nb�zteti meg:\n"
+#~ "egy csak titkos�t�t, �s egy al��r�t �s titkos�t�t. Tulajdonk�ppen ez\n"
+#~ "a kett� ugyanaz, de n�h�ny param�tert speci�lisan kell megv�lasztani\n"
+#~ "ahhoz, hogy a kulcs biztons�gos legyen al��r�s-k�sz�t�shez. Ez a program\n"
+#~ "megteszi ezt, de m�s OpenPGP megval�s�t�soknak nem k�telez� �rteni a\n"
+#~ "az al��r�+titkos�t� fajt�t.\n"
+#~ "\n"
+#~ "Az els�dleges kulcsnak mindig olyannak kell lenni, amely k�pes al��rni.\n"
+#~ "Ez az oka annak, hogy a csak titkos�t� ElGamal kulcs nem szerepel ebben\n"
+#~ "a men�ben."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Hab�r ezek a kulcsok defini�ltak az RFC2440-ben, m�gsem aj�nljuk �ket,\n"
+#~ "mert nem t�mogatottak minden programban, �s az ezekkel k�sz�lt al��r�sok\n"
+#~ "nagyon hossz�ak, �s nagyon lass� az ellen�rz�s�k."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu kulcsot ellen�riztem eddig (%lu al��r�ssal).\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "hi�nyos kulcs\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "A(z) %08lX kulcs hi�nyos.\n"
+
+#~ msgid "quit|quit"
+#~ msgstr "kil�p�s"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (al��r�s �s titkos�t�s)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "Ennek az algoritmusnak a haszn�lat�t csak a GnuPG t�mogatja. Ezzel\n"
+#~ "a kulccsal �n nem fog tudni kommunik�lni a PGP-t haszn�l�kkal. Tov�bb�\n"
+#~ "ez az algoritmus nagyon lass�, �s tal�n nem is olyan biztons�gos, mint\n"
+#~ "a t�bbi v�laszthat�.\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "M�gis l�trehozzam? "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "�rv�nytelen szimmetrikus kulcs� algoritmust tal�ltam (%d).\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "Ez a kulcsszerver nem teljesen HKP kompat�bilis.\n"
diff --git a/po/id.po b/po/id.po
index 407348c29..0831030dd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,61 +1,79 @@
-# gnupg 1.0.7 (Indonesian)
-# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-# Tedi Heriyanto <[email protected]>, 1999, 2000, 2001, 2002.
+# translation of gnupg-id.po to Indonesian
+# gnupg 1.2.4 (Indonesian)
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Tedi Heriyanto <[email protected]>, 1999, 2000, 2001, 2002, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-07-24 21:11GMT+0700\n"
+"Project-Id-Version: gnupg-id\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
+"X-Generator: KBabel 1.3\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
-msgstr "ya"
+msgstr "y|ya"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
-msgstr "tidak"
+msgstr "n|t|tidak"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
-msgstr "keluar"
+msgstr "q|k|keluar"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "kK"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "Kesalahan umum"
@@ -252,7 +270,6 @@ msgstr "tidak dienkripsi"
 msgid "not processed"
 msgstr "tidak diproses"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "kunci publik tidak dapat dipakai"
@@ -265,73 +282,80 @@ msgstr "kunci rahasia tidak dapat dipakai"
 msgid "keyserver error"
 msgstr "kesalahan keyserver"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... kesalahan (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' bukan file reguler - diabaikan\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "catatan: file random_seed kosong\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membaca `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat menulis `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -356,7 +380,32 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Silakan tunggu, entropi sedang dikumpulkan. Lakukan beberapa pekerjaan\n"
+"bila itu tidak akan membosankan anda, karena hal tersebut akan memperbaiki\n"
+"kualitas entropi.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -364,163 +413,128 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[files]|enkripsi file"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "hanya disimpan"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[files]|dekripsi file"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "tandai kunci tidak dapat di-revoke"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "tandai kunci secara lokal dan tidak dapat di-revoke"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "tampilkan hanya urutan paket"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "ekspor nilai ownertrust"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "impor nilai ownertrust"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "perbarui database trust secara otomatis"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "perbaiki database trust yang terkorupsi"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "De-Armor file atau stdin"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "En-Armor file atau stdin"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -530,195 +544,55 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "gunakan kunci baku sebagai penerima baku"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "lebih diam"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "jangan menggunakan terminal"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "paksa signature v3"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "jangan paksa signature v3"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "paksa signature kunci v4"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "jangan paksa signature kunci v4"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "selalu gunakan MDC untuk enkripsi"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "jangan gunakan MDC untuk enkripsi"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "gunakan gpg-agent"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "mode batch: tanpa tanya"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "asumsikan ya untuk seluruh pertanyaan"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "asumsikan tidak untuk seluruh pertanyaan"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "tambah keyring ini ke daftar keyring"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "tambah keyring rahasia ini ke daftar"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "tampilkan keyring tempat kunci yang dipilih berada"
+msgstr "tanya sebelum menimpa"
 
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAMA|set charset terminal ke NAMA"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "baca pilihan dari file"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|tulis info status ke FD ini"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[file]|tulis status info ke file"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|KEYID|sangat percayai kunci ini"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FILE|muat modul ekstensi FILE"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emulasikan mode seperti dalam RFC1991"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP"
-
-#: g10/g10.c:443
-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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|gunakan passphrase mode N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAMA|gunakan algoritma cipher NAMA"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|gunakan algoritma kompresi N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "buang field keyid paket terenkripsi"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Tampilkan Photo IDs"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "Jangan tampilkan Photo IDs"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "Set perintah baris untuk melihat Photo IDs"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -726,7 +600,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -746,15 +620,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
-msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
+msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -764,7 +638,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -772,452 +646,658 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Cipher: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Kompresi: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1166
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1169
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1172
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1178
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
+
+#: g10/g10.c:1193
 #, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
+msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
-msgstr ""
+msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: versi file %d tidak valid\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "opsi ekspor tidak valid\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: opsi impor tidak valid\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "armor tidak valid"
+msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: versi file %d tidak valid\n"
+msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "keyring tidak valid"
+msgstr "opsi ekspor tidak valid\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: opsi impor tidak valid\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: opsi ekspor tidak valid\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "opsi ekspor tidak valid\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr ""
+msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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:1737
+#: g10/g10.c:2441
 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:1743
+#: g10/g10.c:2447
 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:1756
+#: g10/g10.c:2460
 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:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "algoritma digest yang dipilih tidak valid\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1845
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr "algoritma kompresi harus di antara %d..%d\n"
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 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:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "preferensi tidak valid\n"
+msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "preferensi tidak valid\n"
+msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "preferensi tidak valid\n"
+msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "preferensi tidak valid\n"
+msgstr "preferensi kompresi personal tidak valid\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s belum dapat dipakai dengan %s\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
+
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
+"key \n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [namafile]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [namafile]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Pengiriman keyserver gagal: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Penerimaan keyserver gagal: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "Ekspor kunci gagal: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Pencarian keyserver gagal: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "Refresh keyserver gagal: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
+"dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "URL signature kebijakan yang diberikan tidak valid\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "lebih diam"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "mengambil kunci ini dari keyring"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "buat timestamp konflik hanya sebagai peringatan"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|tulis info status ke FD ini"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sintaks: gpg [options] [files]\n"
+"Periksa signature terhadap kunci terpercaya\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Tidak ada nilai trust untuk:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "              alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "              alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1229,188 +1309,208 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = Tidak tahu\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d: Saya TIDAK percaya\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Saya sangat percaya sekali\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = kembali ke menu utama\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = lewati kunci ini\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = berhenti\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Anda ingin menset kunci ini menjadi sangat percaya sekali?"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "kunci %08lX: kunci telah dibatalkan!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Tetap gunakan kunci ini? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "kunci %08lX: subkey telah dibatalkan!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: kunci telah berakhir\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Kita TIDAK percaya kunci ini\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Tidak pasti kunci ini milik pemiliknya\n"
-"tapi tetap diterima\n"
+"%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Kunci ini milik kita\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"Tidak pasti bahwa kunci milik pemiliknya.\n"
+"Tidak pasti bahwa kunci milik orang yang disebutkan\n"
 "Jika anda sangat tahu apa yang sedang anda lakukan, anda boleh menjawab\n"
 "pertanyaan berikut dengan ya\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"Peringatan: kunci ini mungkin dibatalkan:(kunci pembatalan tidak ada)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "        Hal ini dapat berarti bahwa signature adalah palsu.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1418,131 +1518,126 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr "preferensi %c%lu tidak valid\n"
-
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:216
 #, fuzzy
-msgid "invalid character in preference string\n"
-msgstr "Karakter tidak valid dalam string\n"
+msgid "too many digest preferences\n"
+msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "terlalu banyak preferensi `%c'\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "Karakter tidak valid dalam string preferensi\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "menulis self signature\n"
+msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
+msgstr "   (%d) RSA (tandai dan enkripsi)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1555,37 +1650,29 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1593,11 +1680,11 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1605,17 +1692,17 @@ msgstr ""
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1631,7 +1718,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1647,30 +1734,29 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1678,11 +1764,11 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1697,44 +1783,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1744,27 +1830,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1772,16 +1858,16 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1794,7 +1880,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1806,53 +1892,58 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "maaf, tidak dapat melakukan hal ini dalam mode batch\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "kunci ditandai sebagai sangat dipercaya.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1861,638 +1952,709 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, 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:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, 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:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: tidak dapat membuka: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
+
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "menggunakan cipher %s\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
+msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
+msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
-
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+"PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1614
 #, fuzzy, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
-msgstr "kunci tidak valid %08lX dibuat valid oleh --always-trust\n"
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "             diimpor: %lu"
+msgstr "            tidak diimpor: %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:576
 #, c-format
-msgid "key %08lX: no user ID\n"
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s signature, algoritma digest %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:597
+#: g10/import.c:707
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:612
+#: g10/import.c:722
 #, fuzzy, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:619
-#, c-format
-msgid "key %08lX: no valid user IDs\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "kunci %08lX: kunci publik diimpor\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "kunci %08lX: 1 user ID baru\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "kunci %08lX: %d user ID baru\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "kunci %08lX: 1 signature baru\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "kunci %08lX: %d signature baru\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "kunci %08lX: 1 subkey baru\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
+
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "kunci %08lX: %d subkey baru\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:774
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "kunci %08lX: tidak berubah\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1030
+#: g10/import.c:1299
 #, fuzzy, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
+msgid "key %s: 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:1032
+#: g10/import.c:1301
 #, fuzzy, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "kunci %08lX: self-signature tidak valid\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "kunci %08lX: subkey binding tidak valid\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "kunci %08lX: subkey binding tidak valid\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "kunci %08lX: subkey binding tidak valid\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
+"Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
+"Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, 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:360
+#: g10/keyedit.c:314
 #, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Saya cukup percaya\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Saya sangat percaya\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "ID User \"%s\" dibatalkan.\n"
+msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
-#, fuzzy
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Apakah anda yakin masih ingin menandainya?\n"
+msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
-msgstr ""
+msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "PERINGATAN: `%s' adalah file kosong\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID \"%s\" bukan self-signed."
+
+#: g10/keyedit.c:584
+#, 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"
-"\n"
-"Apakah anda ingin menjadikannya signature yang full exportable?\n"
+"Self-signature pada \"%s\"\n"
+"adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
 msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
-"adalah signature.lokal \n"
-"\n"
-"Apakah anda ingin menjadikannya signature yang full exportable?\n"
+"telah habis berlaku.\n"
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
-#, fuzzy, c-format
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
+"berlaku? (y/N)"
+
+#: g10/keyedit.c:632
+#, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
-"\n"
-"Apakah anda ingin menjadikannya signature yang full exportable?\n"
 
-#: g10/keyedit.c:426
-#, fuzzy
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr ""
-"Signature anda saat ini pada \"%s\"\n"
-"adalah signature.lokal \n"
-"\n"
-"Apakah anda ingin menjadikannya signature yang full exportable?\n"
+msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:657
 #, fuzzy, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:660
 #, fuzzy, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Apakah anda ingin menandainya lagi? (y/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:502
-#, fuzzy
+#: g10/keyedit.c:726
 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:535
-#, fuzzy
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
-"anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
+"Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
+"dalam mode --pgp2\n"
 
-#: g10/keyedit.c:537
-#, fuzzy
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
+msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2502,27 +2664,31 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, 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:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2530,32 +2696,31 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
+msgstr ""
+"\n"
+"Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"Signature akan ditandai sebagai tidak dapat diekspor.\n"
+"Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
+"Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2563,7 +2728,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2571,7 +2736,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2579,7 +2744,7 @@ msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2587,7 +2752,7 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2595,33 +2760,34 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2629,7 +2795,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2637,468 +2803,568 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "tandai"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "buat detached signature"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "tandai kunci sebagai tidak dapat dibatalkan"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "hapus ID user"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "addkey"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "tambah kunci sekunder"
+msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primer"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "perbarui preferensi"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "kesalahan keyserver"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "tidak dapat memparsing URI keyserver\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "batalkan sebuah ID user"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1134
-#, fuzzy
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
-msgstr "Kunci dibatalkan.\n"
+msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, 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:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Benar-benar hapus seluruh ID user terpilih? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Benar-benar hapus ID user ini? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "set daftar preferensi"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Fitur: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
 msgid "This key may be revoked by %s key "
-msgstr "Kunci ini mungkin dibatalkan oleh %s kunci %s%s\n"
+msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revoked] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [berakhir: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [berakhir: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey telah dibatalkan: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev - ditemukan pembatalan palsu\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revoked] "
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
+"Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
+"kecuali anda memulai kembali program.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revoked] "
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[expired] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3108,482 +3374,622 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2006
-#, fuzzy
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 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:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"PERINGATAN: Ini adalah kunci bergaya PGP2.x.  Menambahkan sebuah revoker "
+"designated dapat\n"
+"............menyebabkan beberapa versi PGP menolak kunci ini.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Masukkan ukuran kunci"
+msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
+"tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
+"anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
+"sendiri\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+"PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
+"dilakukan\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "kunci %08lX: self-signature tidak valid\n"
+msgstr "melewati self-signature v3 pada user id \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2918
+#: g10/keyedit.c:3499
 #, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
-"ditandai dengan kunci anda %08lX pada %s\n"
+"ditandai secara lokal dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2923
-#, fuzzy, c-format
+#: g10/keyedit.c:3504
+#, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:2927
-#, fuzzy
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Anda tetap ingin menambahkannya? (y/n) "
+msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:2931
-#, fuzzy
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#. FIXME: detect duplicates here
-#: g10/keyedit.c:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:2975
+#: g10/keyedit.c:3558
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s%s\n"
-msgstr "   ditandai oleh %08lX pada %s%s\n"
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
-msgstr ""
+msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3022
-#, fuzzy
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
-msgstr ""
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Kebijakan signature: "
+msgstr "Kebijakan signature kritis: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Notasi signature: "
+msgstr "Notasi signature kritis: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "Keyring"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [berakhir: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revoked] "
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "tampilkan kunci dan fingerprint"
+msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "     Fingerprint kunci ="
+msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "     Fingerprint kunci ="
+msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "     Fingerprint kunci ="
+msgstr "     Fingerprint subkunci ="
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "algoritma hash tidak valid `%s'\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "passphrase jelek atau algoritma cipher (%d) tidak dikenal\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s kunci sesi enkripsi\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "dienkripsi dengan passphrase %lu\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "dienkripsi dengan 1 passphrase\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Notasi: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Kebijakan: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1310
-#, 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:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Signature kadaluwarsa %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "              alias \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Kunci tersedia di:"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature kadaluwarsa %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature kadaluarsa pada %s \n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s signature, algoritma digest %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "biner"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "modeteks"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "tidak dikenal"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 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:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "PERINGATAN: `%s' adalah file kosong\n"
+msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "PERINGATAN: `%s' adalah file kosong\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr ""
+msgstr "silakan gunakan \"%s%s\"\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Tidak dikompresi"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Tidak dikompresi"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "membaca pilihan dari `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "penerima baku tidak dikenal `%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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "tidak dapat menset pid client untuk agen\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "tidak dapat membuat server membaca FD untuk agen\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "tidak dapat membuat server menulis FD untuk agen\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3594,32 +4000,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Masukkan passphrase\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Masukkan passphrase\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "passphrase terlalu panjang\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "respon tidak valid dari agen\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "tidak dapat meminta password dalam mode batch\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Masukkan passphrase: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3629,256 +4043,264 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "tidak dapat meminta password dalam mode batch\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Masukkan passphrase: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, 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:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "kunci %08lX: kunci telah dibatalkan!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "meminta kunci %08lX dari keyserver HKP %s ...\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "tidak dapat memperoleh kunci keyserver: %s\n"
+msgstr "CATATAN: kunci telah dibatalkan"
 
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "kesalahan mengirim ke `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "success sending to `%s' (status=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "failed sending to `%s': status=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "mencari \"%s\" dari server HKP %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "tidak dapat mencari keyserver: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "algoritma proteksi %d%s tidak didukung\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase tidak valid; silakan coba lagi"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr ""
+msgstr "membuat checksum 16-bit terdepresiasi untuk proteksi kunci rahasia\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
-msgstr ""
+msgstr "Peringatan: konflik digest signature dalam pesan\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:99
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
+"PERINGATAN: subkey penanda tangan %08lX memiliki sertifikasi silang yang "
+"tidak valid\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"mengasumsikan signature buruk dari kunci %08lX karena ada bit kritik tidak "
+"dikenal\n"
+
+#: g10/sig-check.c:532
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:558
 #, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "kunci %08lX: tidak ada subkey untuk key binding signature\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "tidak dapat menaruh notasi data ke signature v3(gaya PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "tidak dapat menaruh notasi data ke kunci signature v3 (gaya PGP 2.x)\n"
+
+#: g10/sign.c:112
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
+"PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar).  "
+"Menggunakan yang tidak di-expand.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"tidak dapat menaruh sebuah kebijakan URL ke signature v3 (gaya PGP 2.x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (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
+#: g10/sign.c:187
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "%s signature dari: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 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"
+"anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
+"pgp2\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
+msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -3893,12 +4315,12 @@ msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -3907,194 +4329,264 @@ msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: tidak dapat mengakses: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: tidak dapat membuat lock\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: tidak dapat membuat lock\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: tidak dapat membuat: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "kunci ditandai sebagai sangat dipercaya.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "tidak pernah..."
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "tidak perlu memeriksa trustdb\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "tidak perlu memeriksa trustdb\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "kunci publik %08lX tidak ditemukan: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "lakukanlah --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "kunci publik %08lX tidak ditemukan: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/verify.c:108
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4104,7 +4596,7 @@ msgstr ""
 "Tolong ingat bahwa file signature (.sig atau .asc)\n"
 "haruslah file pertama yang diberikan pada perintah baris.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
@@ -4130,15 +4622,14 @@ msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4157,26 +4648,31 @@ msgstr "%s: suffix tidak dikenal\n"
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: file pilihan baru tercipta\n"
+msgstr "file konfigurasi baru `%s' tercipta\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: direktori tercipta\n"
@@ -4201,45 +4697,45 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
+msgstr "DSA butuh penggunaan algoritma hash 160 bit\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Menghapus kunci ini dari keyring? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
-msgstr ""
+msgstr "informasi ownertrust dihapus\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4251,7 +4747,7 @@ msgstr ""
 "ada\n"
 "kaitan dengan (membuat secara implisit) web-of-certificates."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4263,83 +4759,54 @@ msgstr ""
 "akses ke kunci rahasia.  Jawab \"yes\" untuk menset kunci ini ke\n"
 "sangat dipercaya\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Jika anda ingin menggunakan kunci yang dibatalkan, jawab \"ya\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Masukkan ID user penerima pesan."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Pilih algoritma untuk digunakan.\n"
-"\n"
-"DSA (DSS) adalah algoritma signature digital yang hanya dapat digunakan \n"
-"untuk signature. Ia merupakan algoritma yang disarankan karena verifikasi\n"
-"signature DSA jauh lebih cepat daripada ElGamal.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"ElGamal adalah suatu algoritma yang dapat digunakan untuk signature dan \n"
-"enkripsi. OpenPGP membedakannya ke dalam dua bentuk yaitu: hanya enkripsi\n"
-"dan enkripsi+sign; sebenarnya sama, tetapi beberapa parameter harus dipilih\n"
-"secara khusus untuk membuat kunci yang aman untuk signature; program ini\n"
-"melakukannya tetapi implementasi OpenPGP lain tidak harus memahami bentuk\n"
-"signature+enkripsi.\n"
-"\n"
-"Kunci pertama (primer) harus selalu merupakan kunci yang mampu men-sign;\n"
-"hal ini merupakan alasan mengapa kunci ElGamal hanya-enkripsi tidak ada\n"
-"di menu ini."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Meskipun kunci ini didefinisikan dalam RFC2440 mereka tidak disarankan\n"
-"karena belum didukung oleh seluruh program dan signature yang dibuat\n"
-"oleh mereka cukup besar dan sangat lambat untuk diverifikasi."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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 ""
+"Secara umum bukan ide baik untuk menggunakan kunci yang sama untuk menandai "
+"dan\n"
+"mengenkripsi.  Algoritma ini seharusnya digunakan dalam domain tertentu.\n"
+"Silakan berkonsultasi dulu dengan ahli keamanan anda."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Masukkan ukuran kunci"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Jawab \"ya\" atau \"tidak\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4351,19 +4818,19 @@ msgstr ""
 "tidak akan mendapat respon kesalahan yang baik - sebaiknya sistem akan\n"
 "berusaha menginterprestasi nilai yang diberikan sebagai sebuah interval."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Masukkan nama pemegang kunci"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "silakan masukkan alamat email (pilihan namun sangat dianjurkan)"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Silakan masukkan komentar tambahan"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4377,11 +4844,11 @@ msgstr ""
 "O  untuk melanjutkan dengan pembuatan kunci.\n"
 "K  untuk menghentikan pembuatan kunci."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4459,11 +4926,11 @@ msgstr ""
 "\n"
 "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4471,11 +4938,11 @@ msgstr ""
 "Jawab \"ya\" jika anda benar-benar ingin menghapus ID user ini.\n"
 "Seluruh sertifikat juga akan hilang!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Jawab \"ya\" jika ingin menghapus subkey"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4485,7 +4952,7 @@ msgstr ""
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4497,7 +4964,7 @@ msgstr ""
 "kunci yang digunakan karena kunci penanda ini mungkin membangun suatu\n"
 "koneksi trust melalui kunci yang telah tersertifikasi lain."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4505,7 +4972,7 @@ msgstr ""
 "Signature tidak valid.  Adalah hal yang masuk akal untuk menghapusnya dari\n"
 "keyring anda"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4519,8 +4986,7 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:237
-#, fuzzy
+#: g10/helptext.c:226
 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"
@@ -4530,24 +4996,24 @@ msgstr ""
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
 "yang terpengaruh akan bertambah satu detik.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file tempat berlakunya signature"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika tidak apa-apa menimpa file"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4555,7 +5021,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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4585,7 +5051,7 @@ msgstr ""
 "      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
 "lagi.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4595,113 +5061,656 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#, fuzzy
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Silakan pilih sebuah gambar sebagai ID foto anda.  Gambar haruslah file "
+"JPEG.\n"
+"Ingat bahwa gambar disimpan dalam kunci publik anda..  Jika anda menggunakan "
+"sebuah\n"
+"gambar yang sangat besar, kunci anda akan menjadi semakin besar pula!\n"
+"Jagalah agar gambar mendekati ukuran 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Masukkan nama file JPEG sebagai ID foto: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Tidak dapat membuka foto \"%s\":%s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" bukan sebuah file JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Apakah foto ini benar (y/N/q)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "tidak dapat menampilkan photo ID!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "tidak ada eksekusi program remote yang didukung\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "tidak dapat membuat direktori `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"pemanggilan program eksternal ditiadakan karena permisi opsi file tidak "
+"aman\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"platform ini membutuhkan file temp ketika memanggil program eksternal\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "kesalahan sistem ketika memanggil program eksternal: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "program eksternal berhenti secara tidak natual\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "tidak dapat mengeksekusi program eksternal\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "tidak dapat membaca tanggapan program eksternal: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "tidak pernah..."
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet gagal: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "kunci %08lX: tidak ada ID user\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Akan dibatalkan oleh:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Ini adalah kunci pembatalan sensitif)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Buat sertifikat pembatalan untuk kunci ini?"
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "Pemaksaan output mode ASCII.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "gagal make_keysig_packet: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Sertifikat pembatalan tercipta.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "tidak ada kunci publik yang sesuai: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "algoritma proteksi tidak dikenal\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Sertifikat pembatalan tercipta.\n"
+"\n"
+"Pindahkanlah ke media yang dapat anda sembunyikan; jika Mallory memperoleh\n"
+"akses ke sertifikat ini ia dapat menggunakannya untuk membuat kunci anda\n"
+"tidak dapat digunakan.\n"
+"Adalah hal cerdas untuk mencetak sertifikat ini dan menyimpannya, bila\n"
+"sewaktu-waktu media anda tidak dapat dibaca.  Namun berhati-hatilah:  Sistem "
+"pencetakan\n"
+"mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Silakan pilih alasan untuk pembatalan:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Batal"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Mungkin anda ingin memilih %d di sini)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+"Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Alasan pembatalan: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Tidak diberikan deskripsi)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Ini oke? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "tidak dapat membuka file: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "baris terlalu panjang\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "kesalahan: kurang tanda titik dua\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "kesalahan: fingerprint tidak valid\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "kesalahan: tidak ada nilai ownertrust\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "kesalahan pembacaan: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "PERINGATAN: digest `%s' bukan merupakan bagian OpenPGP.  Gunakan dan "
+#~ "tanggung sendiri risikonya!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[files]|enkripsi file"
+
+#~ msgid "store only"
+#~ msgstr "hanya disimpan"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[files]|dekripsi file"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "tandai kunci tidak dapat di-revoke"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "tandai kunci secara lokal dan tidak dapat di-revoke"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "tampilkan hanya urutan paket"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "ekspor nilai ownertrust"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "impor nilai ownertrust"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "perbarui database trust secara otomatis"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "perbaiki database trust yang terkorupsi"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "De-Armor file atau stdin"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "En-Armor file atau stdin"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "gunakan kunci baku sebagai penerima baku"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "jangan menggunakan terminal"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "paksa signature v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "jangan paksa signature v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "paksa signature kunci v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "jangan paksa signature kunci v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "selalu gunakan MDC untuk enkripsi"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "jangan gunakan MDC untuk enkripsi"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "gunakan gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "mode batch: tanpa tanya"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "asumsikan ya untuk seluruh pertanyaan"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "asumsikan tidak untuk seluruh pertanyaan"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "tambah keyring ini ke daftar keyring"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "tambah keyring rahasia ini ke daftar"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "tampilkan keyring tempat kunci yang dipilih berada"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAMA|set charset terminal ke NAMA"
+
+#~ msgid "read options from file"
+#~ msgstr "baca pilihan dari file"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[file]|tulis status info ke file"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KEYID|sangat percayai kunci ini"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FILE|muat modul ekstensi FILE"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emulasikan mode seperti dalam RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|gunakan passphrase mode N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NAMA|gunakan algoritma cipher NAMA"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|gunakan algoritma kompresi N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "buang field keyid paket terenkripsi"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Tampilkan Photo IDs"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Jangan tampilkan Photo IDs"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Set perintah baris untuk melihat Photo IDs"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "algoritma kompresi `%s' adalah hanya-baca dalam rilis ini\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "algoritma kompresi harus di antara %d..%d\n"
+
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
 #~ msgstr ""
-#~ "anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option "
-#~ "baru\n"
+#~ "%08lX: Tidak pasti kunci ini milik pemiliknya\n"
+#~ "tapi tetap diterima\n"
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "merubah permisi `%s' gagal: %s\n"
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "preferensi %c%lu tidak valid\n"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NAME=VALUE|gunakan notasi data ini"
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
 #~ 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"
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "CATATAN: Kunci primer Elgamal terdeteksi - mungkin membutuhkan beberapa "
+#~ "saat untuk mengimpor\n"
+
+#~ msgid " (default)"
+#~ msgstr " (default)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  diciptakan: %s berakhir: %s"
 
-#~ 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 "Notation: "
+#~ msgstr "Notasi: "
+
+#~ msgid "Policy: "
+#~ msgstr "Kebijakan: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "meminta kunci %08lX dari %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "tidak dapat memperoleh kunci keyserver: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "kesalahan mengirim ke `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "success sending to `%s' (status=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "failed sending to `%s': status=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "keyserver ini tidak mendukung --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "mencari \"%s\" dari server HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "tidak dapat mencari keyserver: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "kunci %08lX: ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk "
+#~ "signature!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "kunci %08lX telah diciptakan dalam %lu detik mendatang (masalah waktu "
+#~ "atau jam)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "kunci %08lX telah diciptakan dalam %lu detik mendatang (masalah waktu "
+#~ "atau jam)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "kunci %08lX ditandai sebagai sangat dipercaya\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr ""
+#~ "signature dari kunci penandaan Elgamal %08lX hingga %08lX dilewati\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "signature dari %08lX ke kunci penandaan Elgamal %08lX dilewati\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Pilih algoritma untuk digunakan.\n"
+#~ "\n"
+#~ "DSA (DSS) adalah algoritma signature digital yang hanya dapat digunakan \n"
+#~ "untuk signature. Ia merupakan algoritma yang disarankan karena "
+#~ "verifikasi\n"
+#~ "signature DSA jauh lebih cepat daripada ElGamal.\n"
+#~ "\n"
+#~ "ElGamal adalah suatu algoritma yang dapat digunakan untuk signature dan \n"
+#~ "enkripsi. OpenPGP membedakannya ke dalam dua bentuk yaitu: hanya "
+#~ "enkripsi\n"
+#~ "dan enkripsi+sign; sebenarnya sama, tetapi beberapa parameter harus "
+#~ "dipilih\n"
+#~ "secara khusus untuk membuat kunci yang aman untuk signature; program ini\n"
+#~ "melakukannya tetapi implementasi OpenPGP lain tidak harus memahami "
+#~ "bentuk\n"
+#~ "signature+enkripsi.\n"
+#~ "\n"
+#~ "Kunci pertama (primer) harus selalu merupakan kunci yang mampu men-sign;\n"
+#~ "hal ini merupakan alasan mengapa kunci ElGamal hanya-enkripsi tidak ada\n"
+#~ "di menu ini."
 
 #~ msgid ""
-#~ "WARNING: This key already has a photo ID.\n"
-#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "PERINGATAN: Kunci ini telah memiliki sebuah photo ID.\n"
-#~ "         Menambahkan photo ID lain dapat membingungkan beberapa versi "
-#~ "PGP.\n"
+#~ "Meskipun kunci ini didefinisikan dalam RFC2440 mereka tidak disarankan\n"
+#~ "karena belum didukung oleh seluruh program dan signature yang dibuat\n"
+#~ "oleh mereka cukup besar dan sangat lambat untuk diverifikasi."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "kunci tidak lengkap\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"
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "kunci %08lX tidak lengkap\n"
 
-#~ msgid "Fingerprint:"
-#~ msgstr "Fingerprint:"
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "keluar"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "            Fingerprint:"
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "Penggunaan algoritma ini hanya didukung oleh GnuPG. Anda tidak dapat\n"
+#~ "menggunakan kunci ini untuk berkomunikasi dengan pengguna PGP.  Algoritma "
+#~ "ini\n"
+#~ "juga sangat lambat, dan mungkin tidak seaman pilihan lainnya.\n"
 
-#~ msgid "Do you really need such a large keysize? "
-#~ msgstr "Apakah anda perlu keysize sebesar itu? "
+#~ msgid "Create anyway? "
+#~ msgstr "Tetap dibuat? "
 
-#~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "terdeteksi algoritma symkey tidak valid (%d)\n"
 
-#~ msgid "  Are you sure you still want to sign it?\n"
-#~ msgstr "  Apakah anda yakin masih ingin menandainya?\n"
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "keyserver ini tidak kompatibel penuh dengan HKP\n"
 
-#~ msgid "   signed by %08lX at %s\n"
-#~ msgstr "   ditandai oleh %08lX pada %s\n"
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?"
diff --git a/po/it.po b/po/it.po
index e21091c6f..ff4e568f7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,56 +4,73 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-05-09 21:57+0200\n"
+"Project-Id-Version: gnupg 1.1.92\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "Attenzione: si sta usando memoria insicura!\n"
+msgstr "ATTENZIONE: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
-msgstr "s�"
+msgstr "si|s�"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "errore generale"
@@ -251,7 +268,6 @@ msgstr "non cifrato"
 msgid "not processed"
 msgstr "non esaminato"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "chiave pubblica inutilizzabile"
@@ -264,75 +280,82 @@ msgstr "chiave segreta inutilizzabile"
 msgid "keyserver error"
 msgstr "errore del keyserver"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... questo � un bug (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
-msgstr "Hai trovato un bug... (%s:%d)\n"
+msgstr "hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un file regolare - ignorato\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: il file random_seed � vuoto\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
-"attenzione: le dimensioni del file random_seed non sono valide - non usato\n"
+"ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -341,7 +364,7 @@ msgid ""
 "\n"
 msgstr ""
 "Il generatore di numeri casuali � solo un ripiego per fare\n"
-"compilare il programma - non � assolutamente un RNG forte!\n"
+"funzionare il programma - non � assolutamente un RNG forte!\n"
 "\n"
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
@@ -358,7 +381,32 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "in questa versione l'algoritmo digest `%s' � in sola lettura\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Attendi, sto raccogliendo entropia. Se pu� evitare di annoiarti lavora un "
+"po',\n"
+"visto che questo migliorer� la qualit� dell'entropia.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "impossibile generare un numero primo di meno di %d bit\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "impossibile generare un numero primo di meno di %d bit\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -366,163 +414,128 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[file]|cifra i file"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "immagazzina soltanto"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[file]|decifra i file"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "firma una chiave irrevocabilmente"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "firma una chiave localmente e irrevocabilmente"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "elenca solo la sequenza dei pacchetti"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "esporta i valori di fiducia"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importa i valori di fiducia"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "aggiornamento non presidiato del database della fiducia"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "ripara un database della fiducia rovinato"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "rimuovi l'armatura a un file o a stdin"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "crea l'armatura a un file o a stdin"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,197 +545,55 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|usa NOME come destinatario predefinito"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "usa la chiave predefinita come destinatario predefinito"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "meno prolisso"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "non usa per niente il terminale"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "forza l'uso di firme v3"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "non forza l'uso di firme v3"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "forza l'uso di firme v4"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "non forza l'uso di firme v4"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "usa sempre un MDC per cifrare"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "non usa mai un MDC per cifrare"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "usa gpg-agent"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "modo batch: non fa domande"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "assumi \"s�\" per quasi tutte le domande"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "assumi \"no\" per quasi tutte le domande"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "aggiungi questo portachiavi alla lista"
+msgstr "chiede prima di sovrascrivere"
 
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "aggiungi questo portachiavi segreto alla lista"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOME|usa NOME come chiave segreta predefinita"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|cerca le chiavi in questo keyserver"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NOME|imposta NOME come set di caratteri del terminale"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "leggi le opzioni dal file"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|scrivi le informazioni di stato sul FD"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[file]|scrivi le informazioni di stato nel file"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FILE|carica il modulo di estensione FILE"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emula il modo descritto in RFC 1991"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"imposta tutte le opzioni di pacchetto,\n"
-"cifrario e digest per OpenPGP"
-
-#: g10/g10.c:443
-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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|usa il modo N per la passphrase"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOME|usa l'algoritmo di cifratura NOME"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOME|usa l'algoritmo di message digest NOME"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|usa l'algoritmo di compressione N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "elimina il campo keyid dei pacchetti cifrati"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Mostra le fotografie"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "Non mostra le fotografie"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "Imposta la riga di comando per vedere le fotografie"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -730,7 +601,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -750,15 +621,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -768,7 +639,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -776,448 +647,655 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "A chiave pubblica: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Cifrari: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Compressione: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1193
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "Attenzione: proprietario \"%s\" di %s insicuro\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1196
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "Attenzione: permessi \"%s\" di %s insicuri\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1202
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "Attenzione: proprietario \"%s\" di %s insicuro\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1205
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "Attenzione: permessi \"%s\" di %s insicuri\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1208
 #, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "elemento della configurazione sconosciuto \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
+msgstr ""
+"NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTA: %s normalmente non deve essere usato!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
+"l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
+"permessi insicuri.\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: versione %d del file non valida\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "opzioni di esportazione non valide\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: opzioni di importazione non valide\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "armatura non valida"
+msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: versione %d del file non valida\n"
+msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "portachiavi non valido"
+msgstr "opzioni di esportazione non valide\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: opzioni di importazione non valide\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "opzioni di importazione non valide\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: opzioni di esportazione non valide\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTA: %s normalmente non deve essere usato!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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:1737
+#: g10/g10.c:2441
 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:1743
+#: g10/g10.c:2447
 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:1756
+#: g10/g10.c:2460
 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:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "questo messaggio pu� non essere utilizzabile da PGP 2.x\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "l'algoritmo di cifratura selezionato non � valido\n"
+
+#: g10/g10.c:2546
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1845
-#, 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:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
+
+#: g10/g10.c:2572
 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:1858
+#: g10/g10.c:2576
 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:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "preferenze non valide\n"
+msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "preferenze non valide\n"
+msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "preferenze non valide\n"
+msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "preferenze non valide\n"
+msgstr "preferenze personali di compressione non valide\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s non funziona ancora con %s\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
+
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
+"crittografia a chiave pubblica\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [nomefile]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "non � possibile usare %s in modalit� %s\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [nomefile]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "non � possibile usare %s in modalit� %s\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "invio al keyserver fallito: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "ricezione dal keyserver fallita: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "esportazione della chiave fallita: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "ricerca nel keyserver fallita: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "aggiornamento del keyserver fallito: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"il nome di una nota deve essere formato solo da caratteri stampabili o\n"
+"spazi e terminare con un '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+
+#: g10/g10.c:3678
 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:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "l'URL della politica di firma indicato non � valido\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "meno prolisso"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "prende le chiavi da questo portachiavi"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "segnala i conflitti di data solo con un avvertimento"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|scrivi le informazioni di stato sul FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sintassi: gpg [opzioni] [file]\n"
+"Controlla le firme con le chiavi affidabili note\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "Questa chiave � stata sostituita"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Questa chiave � stata compromessa"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "La chiave non � pi� usata"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "Ragione della revoca: "
+msgstr "ragione della revoca: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Commento alla revoca: "
+msgstr "commento alla revoca: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Nessun valore di fiducia assegnato a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1229,188 +1307,210 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = Non lo so\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = NON mi fido\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Mi fido definitivamente\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = torna al men� principale\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = salta questa chiave\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = abbandona\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Vuoi davvero assegnare fiducia definitiva a questa chiave? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chiave %08lX: la chiave � stata revocata!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chiave %08lX: la subchiave � stata revocata!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: la chiave � scaduta\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Non � sicuro che questa chiave appartenga veramente al proprietario\n"
-"ma � accettata comunque\n"
+"%08lX: Non ci sono indicazioni che la chiave appartenga al proprietario\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"NON � sicuro che la chiave appartenga al suo proprietario.\n"
-"Se *veramente* sai cosa stai facendo, puoi rispondere s� alla\n"
-"prossima domanda.\n"
+"NON � sicuro che la chiave appartenga alla persona indicata.\n"
+"nell'user ID. Se sai *davvero* cosa stai facendo, puoi\n"
+"rispondere s� alla prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"ATTENZIONE: questa chiave pu� essere stata revocata (la chiave di revoca\n"
+"non � presente).\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr ""
+"ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: questa chiave � stata disabilitata.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "non � possibile usare %s in modalit� %s\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: saltato: chiave pubblica gi� presente\n"
+msgstr "%s: saltata: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1418,130 +1518,126 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
-msgstr "saltato: chiave pubblica gi� impostata come destinatario predefinito\n"
+msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
-msgstr "saltato: chiave pubblica gi� impostata\n"
+msgstr "saltata: chiave pubblica gi� impostata\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: saltato: chiave pubblica disabilitata\n"
+msgstr "%s: saltata: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: 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:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "la preferenza %c%lu � doppia\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "carattere non valido nella stringa delle preferenze\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "ci sono troppe preferenze `%c'\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "ci sono troppe preferenze `%c'\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "carattere non valido nella stringa delle preferenze\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "scrittura della autofirma\n"
+msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (firma e cifra)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (firma e cifra)\n"
+msgstr "   (%d) RSA (firma e cifra)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1554,36 +1650,28 @@ msgstr ""
 "          la dimensione predefinita � 1024 bit\n"
 "  la dimensione massima consigliata � 2048 bit\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 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:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1591,11 +1679,11 @@ msgstr ""
 "Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1603,17 +1691,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1629,7 +1717,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1645,30 +1733,29 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1676,11 +1763,11 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1696,44 +1783,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1744,27 +1831,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1772,16 +1859,16 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1793,7 +1880,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1805,53 +1892,58 @@ 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:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "mi dispiace, non � possibile fare questo in modo batch\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "chiavi marcate definitivamente affidabili.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1860,12 +1952,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1873,7 +1965,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1881,557 +1973,640 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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"
+msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
+"impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "uso il cifrario %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
+"del destinatario\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, 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:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Questo comando non � permesso in modalit� %s.\n"
+"forzare l'algoritmo di compressione %s (%d) viola le preferenze\n"
+"del destinatario\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s cifrato per: %s\n"
+msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+"manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "             importate: %lu"
+msgstr "             importate: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "chiave %08lX: nessun user ID\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Non puoi cancellare l'ultimo user ID!\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:597
+#: g10/import.c:588
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:612
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "chiave %08lX: nessun user ID\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "chiave %08lX: chiave pubblica importata\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "chiave %08lX: 1 nuovo user ID\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "chiave %08lX: %d nuovi user ID\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "chiave %08lX: una nuova firma\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "chiave %08lX: %d nuove firme\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "chiave %08lX: una nuova subchiave\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
+
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "chiave %08lX: %d nuove subchiavi\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:774
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "chiave %08lX: non cambiata\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "chiave %08lX: certificato di revoca importato\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: 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:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "chiave %08lX: legame con la subchiave non valido:\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "chiave %08lX: legame con la subchiave non valido:\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "chiave %08lX: legame con la subchiave non valido:\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1203
-#, 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:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1220
-#, 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:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1698
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"Attenzione: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
+"ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1403
+#: g10/import.c:1711
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"Attenzione: la chiave %08lX pu� essere stata revocata: la chiave di revoca\n"
-"%08lX non � presente.\n"
+"ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
+"revoca %08lX non � presente.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "chiave %08lX: certificato di revoca aggiunto\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Mi fido marginalmente\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Mi fido completamente\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "ATTENZIONE: `%s' � un file vuoto\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "L'user ID \"%s\" non � autofirmato."
+
+#: g10/keyedit.c:584
+#, 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"
+"L'autofirma su \"%s\"\n"
+"� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
+msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"La tua firma attuale su \"%s\"\n"
+"� scaduta\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2440,39 +2615,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 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:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 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:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2480,11 +2659,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 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:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2494,27 +2673,31 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, 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:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2522,32 +2705,31 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "questo pu� essere causato da una autofirma mancante\n"
+msgstr ""
+"\n"
+"Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"La firma sar� marcata come non esportabile.\n"
+"ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"La firma sar� marcata come irrevocabile.\n"
+"ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2555,7 +2737,7 @@ msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2563,7 +2745,7 @@ msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2571,7 +2753,7 @@ msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2579,7 +2761,7 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2587,33 +2769,34 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2621,7 +2804,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2629,954 +2812,1201 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "fai una firma separata"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "firma la chiave irrevocabilmente"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "firma la chiave localmente e irrevocabilmente"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "addkey"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "aggiungi una chiave secondaria"
+msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "preferenze aggiornate"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "errore del keyserver"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "impossibile fare il parsing dell'URI del keyserver\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "revoca un user ID"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "mostra l'ID fotografico"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, 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:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Revoco davvero tutti gli user ID selezionati? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Revoco davvero questo user ID? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "imposta la lista di preferenze"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Caratteristiche: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
 msgid "This key may be revoked by %s key "
-msgstr "Questa chiave pu� essere revocata dalla chiave %s %s%s\n"
+msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (sensibile)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revocata]"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr "[scadenza: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr "[scadenza: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subchiave � stata revocata: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1837
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revocata]"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 #, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
+
+#: g10/keyedit.c:2207
 msgid ""
 "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"
+"Nota che la validit� della chiave indicata non sar� necessariamente "
+"corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revocata]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[scaduta]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"ATTENZIONE: nessun user ID � stato indicato come primario. Questo comando\n"
+"            potrebbe fare diventare un altro user ID il primario "
+"predefinito.\n"
+
+#: g10/keyedit.c:2399
 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 ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
-"            pu� causare il rifiuto della chiave da parte di alcune versioni\n"
-"            di PGP.\n"
+"            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 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:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"ATTENZIONE: Questa � una chiave in stile PGP 2.x. Aggiungere un revocatore\n"
+"            designato pu� causarne il rifiuto da parte di alcune versioni\n"
+"            di PGP.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+"Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
+"PGP 2.x.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Inserisci le dimensioni della chiave"
+msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
+"impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
+"impossibile nominare una chiave come revocatore designato di s� stessa\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr ""
+"ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+"ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
+"annullata.\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
+msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "firmata localmente con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   firmata da %08lX il %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+"ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 "Mostro %s ID fotografici di dimensioni %ld per la chaive 0x%08lX (uid %d)\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Politica di firma: "
+msgstr "Politica critica di firma: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Annotazione della firma: "
+msgstr "Annotazione critica della firma: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr "[scadenza: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revocata]"
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "elenca le chiavi e le impronte digitali"
+msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "     Impronta digitale ="
+msgstr "    Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "     Impronta digitale ="
+msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "     Impronta digitale ="
+msgstr "     Impronta digitale della subchiave:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "algoritmo di hash non valido `%s'\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "passphrase errata o algoritmo di cifratura sconosciuto (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "cifrato con l'algoritmo sconosciuto %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, 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:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "cifratto con %lu passphrase\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "cifratto con 1 passphrase\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Nota: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Policy: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1310
-#, 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:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Firma scaduta il %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                alias \""
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Chiave disponibile presso: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Firma scaduta il %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Questa firma scadr� il %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binario"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "modo testo"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 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:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "ATTENZIONE: %s � una opzione deprecata.\n"
+msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ATTENZIONE: %s � una opzione deprecata.\n"
+msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "usa al suo posto \"--keyserver-options %s\"\n"
+msgstr "usa al suo posto \"%s%s\"\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Non compresso"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Non compresso"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "lettura delle opzioni da `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "destinatario predefinito `%s' sconosciuto\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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
+"non sicura\n"
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "impossibile impostare il pid del client dell'agent\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "impossibile ottenere il FD di lettura dell'agent\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "impossibile ottenere il FD di scrittura dell'agent\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3587,32 +4017,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Inserisci la passphrase\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Inserisci la passphrase\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "passphrase troppo lunga\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "risposta non valida dall'agent\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "impossibile chiedere la password in modo batch\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Inserisci la passphrase: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3622,264 +4060,282 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "impossibile chiedere la password in modo batch\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Inserisci la passphrase: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, 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:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "chiave %08lX: la chiave � stata revocata!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "richiedo la chiave %08lX dal keyserver HKP %s\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "impossibile scaricare la chiave dal keyserver: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "errore leggendo `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "inviata con successo a `%s' (status=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "invio a `%s' fallito: status=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "cerco \"%s\" sul server HKP %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "impossibile cercare sul keyserver: %s\n"
+msgstr "NOTA: la chiave � stata revocata"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "l'algoritmo di protezione %d%s non � gestito\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase non valida; riprova"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "genero il checksum a 16 bit deprecato per la protezione della chiave "
 "segreta\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
+msgstr "ATTENZIONE: conflitto del digest delle firme nel messaggio\n"
+
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
+"ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
+"incrociata\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:102
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"questa � una chiave ElGamal generata da PGP e NON � sicura per le firme!\n"
+"ATTENZIONE: la sottochiave per firme %08lX ha una certificature incrociata\n"
+"non valida\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "la chiave pubblica � %lu secondo pi� recente della firma\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "la chiave pubblica � %lu secondi pi� recente della firma\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "la chiave pubblica %08lX � pi� recente della firma di %lu secondi\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
-"si suppone una firma non valida a causa di un bit critico sconosciuto\n"
+"si suppone una firma non valida della chiave %08lX a causa di un\n"
+"bit critico sconosciuto\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:532
 #, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr ""
+"chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
+"subchiave\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr ""
+"chiave %08lX: non c'� una subchiave per la firma di collegamento della "
+"subchiave\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "impossibile inserire notation data nelle firme v3 (stile PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+"impossibile inserire notation data nelle firme di chiavi v3 (stile PGP 2.x)\n"
+
+#: g10/sign.c:112
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
-"ATTENZIONE: Impossibile espandere i %% nell'URL (troppo lunga). Usata "
+"ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:151
-#, c-format
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"impossibile inserire l'URL di una policy nelle firme v3 (stile PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"impossibile inserire l'URL di una policy nelle firme di chiavi v3 (stile\n"
+"PGP 2.x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
-"ATTENZIONE: Impossibile espandere i %% nell'URL (troppo lunga). Usata "
-"inespansa.\n"
+"ATTENZIONE: Impossibile espandere i %% nell'URL della policy (troppo "
+"lunga).\n"
+"Usata inespansa.\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"ATTENZIONE: Impossibile espandere i %% nell'URL della policy (troppo "
+"lunga).\n"
+"Usata inespansa.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "Firma %s da: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 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"
+msgstr ""
+"nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
+"2.x\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, 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"
+"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
@@ -3894,12 +4350,12 @@ msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
@@ -3908,195 +4364,265 @@ msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossibile acedere a: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: impossibile creare il lock\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: impossibile creare il lock\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: � stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "NOTA: il trustdb non � scrivibile\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un key ID lungo valido\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chiave %08lX: appare nel trustdb pi� di una volta\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "chiavi marcate definitivamente affidabili.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "il trust record %lu non � del tipo richiesto %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "mai       "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "non � necessario un controllo del trustdb\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "non � necessario un controllo del trustdb\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "chiave pubblica %08lX non trovata: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "per favore usa --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "chiave pubblica %08lX non trovata: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "controllo al livello %d firmato=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/verify.c:108
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4106,7 +4632,7 @@ msgstr ""
 "Ricorda che il file con la firma (.sig or .asc) deve\n"
 "essere il primo file indicato sulla riga di comando.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
@@ -4132,15 +4658,14 @@ msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
 "le firme!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4159,26 +4684,33 @@ msgstr "%s: suffisso sconosciuto\n"
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: creato un nuovo file delle opzioni\n"
+msgstr "creato un nuovo file di configurazione `%s'\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
+"esecuzione del programma\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directory creata\n"
@@ -4205,45 +4737,45 @@ msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Vuoi cancellare questa chiave dal portachiavi? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "informazioni di fiducia del possessore cancellate\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4253,7 +4785,7 @@ msgstr ""
 "terzi. Ci serve per implementare il web-of-trust; non ha nulla a che fare\n"
 "con il web-of-certificates (creato implicitamente)."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4266,87 +4798,54 @@ msgstr ""
 "segreta.\n"
 "Rispondi \"s�\" per impostare questa chiave come definitivamente affidabile\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Se vuoi usare comunque questa chiave revocata, rispondi \"si\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Seleziona l'algoritmo da usare.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (alias DSS) � un algoritmo usabile solo per firmare. E l'algoritmo\n"
-"suggerito perch� verificare firme DSA � molto pi� veloce di quelle ElGamal.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal � un algoritmo usabile per firmare e cifrare.\n"
-"OpenPGP distingue tra due versioni di questo algoritmo: una solo per "
-"firmare\n"
-"e una per firmare e cifrare. In realt� � sempre lo stesso, ma per creare\n"
-"firme sicure per la cifratura occorre scegliere in un modo particolare "
-"alcuni\n"
-"parametri: questo programma lo fa ma non � richiesto che altre "
-"implementazioni\n"
-"di OpenPGP capiscano la versione per firmare e cifrare.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"La prima chiave (primaria) deve sempre essere una chiave in grado di "
-"firmare;\n"
-"questo � il motivo per cui le chiavi ElGamal solo per cifrare non sono\n"
-"disponibili in questo men�."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Anche se queste chiavi sono definite da RFC2400 non sono suggerite perch� "
-"non\n"
-"sono gestite da tutti i programmi e le firme create sono grandi e lunghe da\n"
-"verificare."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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 ""
+"In generale non � una buona idea usare la stessa chiave per le firme e la\n"
+"cifratura. Questo algoritmo dovrebbe solo essere usato in determinati "
+"campi.\n"
+"Per favore consulta prima il tuo esperto di sicurezza."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Inserisci le dimensioni della chiave"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Rispondi \"si\" o \"no\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4358,19 +4857,19 @@ msgstr ""
 "messaggio di errore corretto: il sistema cerca di interpretare il valore\n"
 "dato come un intervallo."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Inserisci il nome del proprietario della chiave"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "Inserisci un indirizzo di email opzionale (ma fortemente suggerito)"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Inserisci un commento opzionale"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4384,11 +4883,11 @@ msgstr ""
 "O  per continuare con la generazione della chiave.\n"
 "Q  per abbandonare il processo di generazione della chiave."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4467,11 +4966,11 @@ msgstr ""
 "\n"
 "Se non sai cosa rispondere, rispondi \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4479,11 +4978,11 @@ msgstr ""
 "Rispondi \"si\" se vuoi davvero cancellare questo user ID.\n"
 "Tutti i certificati saranno persi!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Rispondi \"si\" se va bene cancellare la subchiave"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4494,7 +4993,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4508,13 +5007,13 @@ msgstr ""
 "usata perch� questa chiave potrebbe stabilire una connessione di fiducia\n"
 "attraverso una chiave gi� certificata."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 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:229
+#: g10/helptext.c:218
 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"
@@ -4529,7 +5028,7 @@ msgstr ""
 "non\n"
 "� valida per qualche ragione e ne � disponibile un'altra."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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"
@@ -4540,23 +5039,23 @@ msgstr ""
 "la lista di preferenze corrente. L'orario di tutte le autofirme coinvolte\n"
 "sar� aumentato di un secondo.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 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:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4564,7 +5063,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4593,7 +5092,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:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4603,102 +5102,633 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Non � disponibile un aiuto"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "controllo il portachiavi `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "Per ora sono state controllate %lu chiavi (%lu firme)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#, fuzzy
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Scegli un'immagine da usare per l'identificazione fotografica. L'immagine "
+"deve\n"
+"essere un file JPEG. Ricorda che l'immagine � immagazzinata nella tua "
+"chiave\n"
+"pubblica, se usi una immagine molto grande anche la tua chiave diventer� "
+"molto\n"
+"grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Inserisci il nome del file JPEG per l'ID fotografico: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Impossibile aprire la foto \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Sei sicuro di volerla usare? (s/N) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\": non � un file JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Questa foto � giusta? (s/N/q) "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "impossibile mostrare l'ID fotografico\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "l'esecuzione remota dei programmi non � gestita\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "impossibile creare la directory `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"le chiamate a programmi esterni sono disattivate a causa dei permessi non\n"
+"sicuri del file delle opzioni\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"questa piattaforma richiede file temporanei quando si chiamano programmi "
+"esterni\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "impossibile eseguire %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "errore di sistema chiamando il programma esterno: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "uscita anormale del programma esterno\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "impossibile eseguire il programma esterno\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "impossibile leggere la risposta del programma esterno: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "mai       "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet fallito: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "chiave %08lX: nessun user ID\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Revocabile da:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Questa � una chiave di revoca sensibile)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Creare un certificato di revoca per questa chiave? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "Forzato l'output con armatura ASCII.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet fallito: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Certificato di revoca creato.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "non sono state trovate chiavi di revoca per `%s'\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "chiave segreta `%s' non trovata: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "non c'� una chiave pubblica corrispondente: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "algoritmo di protezione sconosciuto\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOTA: Questa chiave non � protetta!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Creato un certificato di revoca.\n"
+"\n"
+"Per favore spostalo su un media che puoi nascondere; se l'uomo nel mezzo\n"
+"riuscir� ad accedere a questo certificato potr� usarlo per rendere\n"
+"inutilizzabile la tua chiave. � una buona idea stamparlo ed archiviarlo,\n"
+"nel caso il media diventasse illeggibile. Ma fai attenzione: il sistema di\n"
+"stampa della tua macchina potrebbe immagazzinare i dati e renderli "
+"disponibili\n"
+"ad altri!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Per favore scegli il motivo della revoca:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Cancella"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probabilmente volevi scegliere %d)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Motivo della revoca: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Non � stata data una descrizione)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Va bene cos�? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Lista dei valori della fiducia assegnati, creata il %s\n"
+"# (Usa \"gpg --import-ownertrust\" per ripristinarli)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "impossibile aprire il file: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "riga troppo lunga\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "errore: mancano due punti\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "errore: impronta digitale non valida\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "errore: non c'� il valore della fiducia\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "errore cercando il record della fiducia: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "errore di lettura: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "ATTENZIONE: il digest `%s' non fa parte di OpenPGP.\n"
+#~ "Da usare a proprio rischio!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[file]|cifra i file"
+
+#~ msgid "store only"
+#~ msgstr "immagazzina soltanto"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[file]|decifra i file"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "firma una chiave irrevocabilmente"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "firma una chiave localmente e irrevocabilmente"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "elenca solo la sequenza dei pacchetti"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "esporta i valori di fiducia"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "importa i valori di fiducia"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "aggiornamento non presidiato del database della fiducia"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "ripara un database della fiducia rovinato"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "rimuovi l'armatura a un file o a stdin"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "crea l'armatura a un file o a stdin"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOME|usa NOME come destinatario predefinito"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usa la chiave predefinita come destinatario predefinito"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "non usa per niente il terminale"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "forza l'uso di firme v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "non forza l'uso di firme v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "forza l'uso di firme v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "non forza l'uso di firme v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "usa sempre un MDC per cifrare"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "non usa mai un MDC per cifrare"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "usa gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "modo batch: non fa domande"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "risponde \"s�\" a quasi tutte le domande"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "risponde \"no\" a quasi tutte le domande"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "aggiungi questo portachiavi alla lista"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "aggiungi questo portachiavi segreto alla lista"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NOME|usa NOME come chiave segreta predefinita"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|cerca le chiavi in questo keyserver"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NOME|imposta NOME come set di caratteri del terminale"
+
+#~ msgid "read options from file"
+#~ msgstr "leggi le opzioni dal file"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[file]|scrivi le informazioni di stato nel file"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FILE|carica il modulo di estensione FILE"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emula il modo descritto in RFC 1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "imposta tutte le opzioni di pacchetto,\n"
+#~ "cifrario e digest per OpenPGP"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|usa il modo N per la passphrase"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NOME|usa l'algoritmo di cifratura NOME"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NOME|usa l'algoritmo di message digest NOME"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usa l'algoritmo di compressione N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "elimina il campo keyid dei pacchetti cifrati"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Mostra le fotografie"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Non mostra le fotografie"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Imposta la riga di comando per vedere le fotografie"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "in questa versione l'algoritmo di compressione `%s' � in sola lettura\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Non � sicuro che questa chiave appartenga veramente al "
+#~ "proprietario\n"
+#~ "ma � accettata comunque\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "la preferenza %c%lu non � valida\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
+
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
 #~ msgstr ""
-#~ "� necessario eseguire di nuovo GnuPG in modo che possa leggere il nuovo\n"
-#~ "file delle opzioni\n"
+#~ "NOTA: trovata una chiave primaria Elgamal - importarla pu� essere lungo\n"
+
+#~ msgid " (default)"
+#~ msgstr " (predefinito)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Nota: "
+
+#~ msgid "Policy: "
+#~ msgstr "Policy: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "richiedo la chiave %08lX a %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "impossibile scaricare la chiave dal keyserver: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "errore leggendo `%s': %s\n"
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "cabiamento dei permessi di `%s' fallito: %s\n"
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "inviata con successo a `%s' (status=%u)\n"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NOME=VALORE|usa questi dati per una nota"
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "invio a `%s' fallito: status=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "questo keyserver non gestisce --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "cerco \"%s\" sul server HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "impossibile cercare sul keyserver: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "chiave %08lX: questa � una chiave ElGamal generata da PGP che NON � "
+#~ "sicura per le firme!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "la chiave %08lX � stata creata %lu secondo nel futuro (salto nel tempo\n"
+#~ "o problema con l'orologio)\n"
 
 #~ msgid ""
-#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "la chiave %08lX � stata creata %lu secondi nel futuro (salto nel tempo\n"
+#~ "o problema con l'orologio)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "chiavi %08lX marcate come definitivamente affidabile\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "ignorata la firma dalla chiave per firme Elgamal %08lX a %08lX\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "ignorata la firma da %08lX alla chiave per firme Elgamal %08lX\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 #~ msgstr ""
-#~ "il primo carattere del nome di una nota deve essere una lettera o un\n"
-#~ "underscore\n"
+#~ "controllo al livello %d firmato=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\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 ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Seleziona l'algoritmo da usare.\n"
+#~ "\n"
+#~ "DSA (alias DSS) � un algoritmo usabile solo per firmare. E l'algoritmo\n"
+#~ "suggerito perch� verificare firme DSA � molto pi� veloce di quelle "
+#~ "ElGamal.\n"
+#~ "\n"
+#~ "ElGamal � un algoritmo usabile per firmare e cifrare.\n"
+#~ "OpenPGP distingue tra due versioni di questo algoritmo: una solo per "
+#~ "firmare\n"
+#~ "e una per firmare e cifrare. In realt� � sempre lo stesso, ma per creare\n"
+#~ "firme sicure per la cifratura occorre scegliere in un modo particolare "
+#~ "alcuni\n"
+#~ "parametri: questo programma lo fa ma non � richiesto che altre "
+#~ "implementazioni\n"
+#~ "di OpenPGP capiscano la versione per firmare e cifrare.\n"
+#~ "\n"
+#~ "La prima chiave (primaria) deve sempre essere una chiave in grado di "
+#~ "firmare;\n"
+#~ "questo � il motivo per cui le chiavi ElGamal solo per cifrare non sono\n"
+#~ "disponibili in questo men�."
 
 #~ msgid ""
-#~ "WARNING: This key already has a photo ID.\n"
-#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "ATTENZIONE: Questa chiave ha gi� un ID fotografico.\n"
-#~ "            Aggiungerne un altro pu� confondere alcune versioni di PGP.\n"
+#~ "Anche se queste chiavi sono definite da RFC2400 non sono suggerite perch� "
+#~ "non\n"
+#~ "sono gestite da tutti i programmi e le firme create sono grandi e lunghe "
+#~ "da\n"
+#~ "verificare."
 
-#~ msgid "You may only have one photo ID on a key.\n"
-#~ msgstr "� possibile avere un solo ID fotografico su ogni chiave.\n"
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "Per ora sono state controllate %lu chiavi (%lu firme)\n"
 
-#~ msgid "Fingerprint:"
-#~ msgstr "Impronta digitale:"
+#~ msgid "key incomplete\n"
+#~ msgstr "chiave incompleta\n"
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "       Impronta digitale:"
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "chiave %08lX incompleta\n"
diff --git a/po/ja.po b/po/ja.po
index 8af08559c..31b39439b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,62 +1,79 @@
 # Japanese messages for GnuPG
-# Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
-# IIDA Yosiaki <[email protected]>, 1999, 2000, 2002.
+# Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+# IIDA Yosiaki <[email protected]>, 1999, 2000, 2002, 2003.
 # Yoshihiro Kajiki <[email protected]>, 1999.
 # This file is distributed under the same license as the GnuPG package.
 # Special thanks to "Takashi P.KATOH".
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-05-10 07:28-0400\n"
+"Project-Id-Version: gnupg 1.2.1\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-12-06 00:44+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "�ٹ�: ��Ф����꡼����Ѥ��Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���ݤʥ��꡼����Ѥ��Ƥ��ޤ�!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤϼ¹ԤǤ��ޤ���\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ��������Ѥ����ΤǤ��礦)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "����Ū�ʥ��顼"
@@ -215,7 +232,7 @@ msgstr "ͽ�����̥ǡ����Ǥ�"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
-msgstr "���դ����ͤ��Ƥ��ޤ�"
+msgstr "������̷�⤷�Ƥ��ޤ�"
 
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
@@ -253,7 +270,6 @@ msgstr "�Ź沽����Ƥ��ޤ���"
 msgid "not processed"
 msgstr "̤����"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "���ѤǤ��ʤ��������Ǥ�"
@@ -266,73 +282,80 @@ msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 msgid "keyserver error"
 msgstr "�������С��Υ��顼"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "`%s'�������ޤ���: %s\n"
+msgstr "��%s�פ������ޤ���: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "`%s'��Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
+msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' �����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
+msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "�ٹ�: ̵���ʥ������� random_seed �ե����� - �Ȥ��ޤ���\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "`%s'���ɤ�ޤ���: %s\n"
+msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "`%s'���Ǥ��ޤ���: %s\n"
+msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "`%s'�˽񤱤ޤ���: %s\n"
+msgstr "��%s�פ˽񤱤ޤ���: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "`%s'���Ĥ����ޤ���: %s\n"
+msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "�ٹ�: ��Ф���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
+msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -357,7 +380,31 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/g10.c:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "���󥢥르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"�𻨤���������Ƥ��ޤ��Τǡ����Ԥ������������𻨤��μ�������\n"
+"���ޤ��Τǡ��⤷˰�����鲿����Ȥ��Ƥ���������\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -365,165 +412,128 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[�ե����뷲]|�ե����뷲��Ź沽"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "��¸�Τ�"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[�ե����뷲]|�ե����뷲������"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:323
-msgid "check key signatures"
-msgstr "���ν�̾�򸡾�"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "���ν�̾�򸡺�"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦���˽�̾"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
-msgstr "�˴������������"
+msgstr "���������������"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "�ѥ��å���Τߤΰ���"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "�����Ƥ��Ƥʤ����ѥǡ����١����򹹿�"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "���줿���ѥǡ����١�������"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr ""
-"�ե�����ޤ���ɸ�����Ϥ�\n"
-"��������"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -533,237 +543,59 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr ""
-"|̾��|����μ����ԤȤ���\n"
-"��̾���פ����"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "����μ����Ԥ˴���θ������"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "����Ť�"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "ü�����Ի���"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "����Ū��v3��̾"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "v3��̾�������ʤ�"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "����Ū��v4��̾"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "v4��̾�������ʤ�"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "�Ź沽�ˤϾ��MDC�����"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "gpg����������Ȥ����"
+msgstr "������˳�ǧ"
 
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "�Хå����⡼��: ��ǧ��ά"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"�����Ƥ��μ����������yes\n"
-"�Ȥߤʤ�"
 
-#: g10/g10.c:411
-msgid "assume no on most questions"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
-"�����Ƥ��μ����������no\n"
-"�Ȥߤʤ�"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "�����θ������븰�ؤ�ɽ��"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr ""
-"|̾��|�������̩���Ȥ���\n"
-"��̾���פ����"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|�ۥ���|���θ����ˤ��θ������С������"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr ""
-"|CHARSET̾|ü����charset���CHARSET̾��\n"
-"������"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr ""
-"�ե����뤫�饪�ץ�����\n"
-"�ɤ߹���"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr ""
-"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
-"�񤭽Ф�"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr ""
-"|�ե�����|���ơ����������ե������\n"
-"�񤭽Ф�"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|��ID|���θ�����Ū�˿��Ѥ���"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr ""
-"|�ե�����|��ĥ�⥸�塼��Υե������\n"
-"�ɤ߹���"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr ""
-"RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
-"����"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr ""
-"�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
-"�������OpenPGP��������"
-
-#: g10/g10.c:443
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
-"�ѥ��åȤȰŹ������Υ��ץ���\n"
-"�������PGP 2.x��������"
 
-#: g10/g10.c:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|�ѥ��ե졼�����⡼��N�����"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr ""
-"|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
-"���������󥢥르�ꥺ������"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr ""
-"|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
-"���르�ꥺ������"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr ""
-"|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
-"����"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr ""
-"|̾��|��̾���פΥ�å���������\n"
-"���르�ꥺ������"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr ""
-"|̾��|��̾���פΰ��̥��르�ꥺ���\n"
-"����"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr ""
-"�Ź�ѥ��åȤθ�ID�ե������\n"
-"������"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "�ե���ID��ɽ��"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "�ե���ID��ɽ�����ʤ�"
-
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr ""
-"�ե���ID��������륳�ޥ�ɹ�\n"
-"������"
-
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -772,7 +604,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -786,31 +618,31 @@ msgstr ""
 "@\n"
 "��:\n"
 "\n"
-" -se -r Bob [�ե�����]      �桼����Bob�ؤν�̾�ȰŹ沽\n"
-" --clearsign [�ե�����]     ���ꥢ��̾������\n"
-" --detach-sign [�ե�����]   ʬΥ��̾������\n"
+" -se -r Bob [�ե�����]      ��̾�ȥ桼����Bob�ؤΰŹ沽\n"
+" --clearsign [�ե�����]     ���ꥢ��̾�����\n"
+" --detach-sign [�ե�����]   ʬΥ��̾�����\n"
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
 "��: gpg [���ץ����] [�ե�����]\n"
-"��̾�����ڡ��Ź沽������\n"
+"��̾���������Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -818,446 +650,650 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "������: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "�Ź�: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "�ϥå���: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "����: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
-msgstr "���ޥ�ɤξ���\n"
+msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1166
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ���ͭ��\n"
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1169
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ�����\n"
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1172
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ���ͭ��\n"
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1178
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ�����\n"
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1181
 #, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+
+#: g10/g10.c:1334
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
+msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
+msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "���ץ���󡦥ե�����`%s': %s\n"
+msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
+msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
-msgstr ""
+msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
-msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
+msgstr "%s�ϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "�������С���URI�������ǽ\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: ̵���ʥե����롦�С������%d\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "̵���������Ǥ�"
+msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: ̵���ʥե����롦�С������%d\n"
+msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "���ؤ�̵���Ǥ�"
+msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "����: ����%s���Ѥ��ޤ���!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥ�IDEA�Ź椬�׵ᤵ��ޤ� \n"
-
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "���Υ�å�������PGP 2.x�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
+msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź椬ɬ�פǤ� \n"
 
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
-msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
+msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1845
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
+
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "̵����ͥ����\n"
+msgstr "̵���ʴ��������\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "̵����ͥ����\n"
+msgstr "̵���ʸĿ��ѰŹ������\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "̵����ͥ����\n"
+msgstr "̵���ʸĿ������������\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "̵����ͥ����\n"
+msgstr "̵���ʸĿ��Ѱ��̤�����\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
+msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [�ե�����̾]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [�ե�����̾]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �桼����id"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �桼����id"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "`%s'�������ޤ���\n"
+msgstr "��%s�פ������ޤ���\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
-"����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
-"'='�ǽ����ʤ���Фʤ�ޤ���\n"
+"����̾�ˤϰ�����ǽ��ʸ��������Τߤ��Ѥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
-#: g10/g10.c:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "����Ť�"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "���θ����ؤ��������ޤ�"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "������̷���ٹ�����ˤ��ޤ�"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr ""
+"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
+"�񤭽Ф�"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"��ʸ: gpg [���ץ����] [�ե�����]\n"
+"���Ѥ������ǽ�̾�򸡺�\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "����: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "̵���������إå���: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "�����إå���: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "̵���ʥ��ꥢ��̾�إå���\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "ͽ����������:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "̵����64��ʸ��%02x��ȤФ��ޤ�\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
-msgstr "�ե������������᤹���ޤ� (CRC����ˤ���ޤ�)\n"
+msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC���顼��%06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "��������� quoted printable ʸ��������ޤ��������餯�Х��Τ���\n"
 "MTA����Ѥ����ΤǤ��礦\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "�����Ȥ꤫��äƤ��ޤ�"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "�����ѥ����ޤ���"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "���Ϥ⤦�Ȥ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "�˴���ͳ: "
+msgstr "������ͳ: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Ŭ��: "
+msgstr "������Ŭ��: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "�����٤����ꤵ��Ƥ��ޤ���:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "       ��̾ \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "       ��̾ \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1265,188 +1301,208 @@ msgid ""
 "\n"
 msgstr ""
 "¾�Υ桼�����θ������������ڤ��뤿��ˡ����Υ桼�����ο����٤����\n"
-"��������(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������Ⱦȹ礷����...)?\n"
+"��������(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺�������...)?\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = ̤��\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = ���Ѥ� �ʤ�\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = �������ٿ��Ѥ���\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = �����˿��Ѥ���\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = ����Ū�˿��Ѥ���\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
-msgstr " i = ���ܤ�������򸫤�\n"
+msgstr " i = ���ܤ��������ɽ������\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = �᡼�󡦥�˥塼�����\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = ���θ��ϤȤФ�\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = ��λ\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
-msgstr "��%08lX: �����˴��ѤߤǤ�!\n"
+msgstr "��%08lX: ���ϼ����ѤߤǤ�!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
-msgstr "��%08lX: �������˴��ѤߤǤ�!\n"
+msgstr "��%08lX: �����ϼ����ѤߤǤ�!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "��%08lX: ���ϴ����ڤ�Ǥ�\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: ���θ����ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr "%08lX: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: ���θ��Ͽ��ѤǤ��� ����\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
-msgstr ""
-"%08lX: ���θ��ϼºݤ��ܿͤΤ�Τ��������Ǥ�����\n"
-"���������������ޤ�\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "%08lX: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "���θ��Ϥ��֤��ܿͤΤ�ΤǤ�\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
-msgstr "���θ��ϲ桹�Τ�ΤǤ�\n"
+msgstr "���θ��ϼ�ʬ�Τ�ΤǤ�\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"���θ����ܿͤΤ�Τ��ɤ����ο��Ǥ��� ����\n"
-"������Ԥ����Ȥ� *�μ¤�* ���򤷤Ƥ��ʤ����ˤϡ�\n"
+"���θ��ϡ����Υ桼����ID��ʤΤ��ܿͤΤ�Τ��ɤ����ο��Ǥ���\n"
+"���󡣺�����Ԥ����Ȥ� *�μ¤�* ���򤷤Ƥ��ʤ����ˤϡ�\n"
 "���μ���ˤ�no�������Ƥ���������\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�ٹ�: ���ѤǤ��ʤ������Ѥ��Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX���Ժߡ�\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "�ٹ�: ���θ����ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "�ٹ�: �����������ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
+msgstr "�ٹ�: �����������ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "����: ���θ��ϴ����ڤ�Ǥ�!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n"
 
-#: g10/pkclist.c:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1454,130 +1510,126 @@ msgstr ""
 "\n"
 "�桼����ID�����ϡ����Ԥǽ�λ: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
-msgstr "�����å�: �������ϴ���μ����ԤȤ�������ѤߤǤ�\n"
+msgstr "�����å�: �������ϴ���μ���ͤȤ�������ѤߤǤ�\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "�����å�: ������������ѤߤǤ�\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
-msgstr "����μ�����`%s'�����Ĥ���ޤ���\n"
+msgstr "����μ���͡�%s�פ����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr "����%c%lu��ͭ���ǤϤ���ޤ���\n"
-
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "����%c%lu�ν�ʣ\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
-msgstr "¿������`%c'����\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "¿�������%c������\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "¿�������%c������\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "¿�������%c������\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
+msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
-msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
+msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ���������%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "����������%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA��ElGamal (����)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
+msgstr "   (%d) RSA (��̾�ȰŹ沽)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "�ɤ�ˤ��ޤ���? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
-msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr "���Υ��르�ꥺ���ȿ�Ф���Ƥ��ޤ� - ����Ǥ���ޤ���? "
-
-#: g10/keyedit.c:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1590,36 +1642,28 @@ msgstr ""
 "             ����θ�Ĺ�� 1024 �ӥå�\n"
 "         ����ο侩��Ĺ�� 2048 �ӥå�\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
 
-#: g10/keygen.c:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1627,11 +1671,11 @@ msgstr ""
 "2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
 "�侩���ޤ���!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1639,17 +1683,17 @@ msgstr ""
 "�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
 "����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1658,14 +1702,14 @@ msgid ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"���δ��¤���Ƥ���������\n"
+"����ͭ�����¤���Ƥ���������\n"
 "         0 = ̵����\n"
 "      <n>  = ͭ������ n ����\n"
 "      <n>w = ͭ������ n ����\n"
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1674,37 +1718,36 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"��̾�δ��¤���Ƥ���������\n"
+"��̾��ͭ�����¤���Ƥ���������\n"
 "         0 = ̵����\n"
 "      <n>  = ͭ������ n ����\n"
 "      <n>w = ͭ������ n ����\n"
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s��%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1712,11 +1755,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "����Ǥ����Ǥ��� (y/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1732,75 +1775,75 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"���Υ桼����ID�����ꤷ�ޤ���:\n"
+"���Υ桼����ID�����򤷤ޤ���:\n"
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
-#: g10/keygen.c:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1542
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1808,16 +1851,16 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1829,7 +1872,7 @@ msgstr ""
 "�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1840,53 +1883,58 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "��ǰ�ʤ��顢�Хå��⡼�ɤǤϤǤ��ޤ���\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
-msgstr "`%s'�ظ�������񤭹��ߤޤ�\n"
+msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "`%s'����̩����񤭹��ߤޤ�\n"
+msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "��������`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "��̩����`%s'�ν���ߥ��顼: %s\n"
+msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1894,563 +1942,640 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "�����˺��ޤ���? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: �����ޤ���: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
+
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s'�ϴ��˰��̺ѤߤǤ�\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'�����ɤ߹��ߤޤ�\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
+msgstr "�оΰŹ楢�르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
-
-#: g10/encode.c:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s�Ź沽 ������: %s\n"
+msgstr "%s/%s�Ź沽 ������: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "��`%s'�����Ĥ���ޤ���: %s\n"
+msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɹ��ߥ��顼: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�� %08lX: PGP 2.x�����θ��Ǥ� - �����å�\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "�ٹ�: ��̩��%08lX�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[�桼����id�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%08lX�Ǥ�\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "��������%08lX�ˤ���������̩����������ޤ��� - ̵��\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "��%08lX: �������Τʤ���̩���Ǥ� - �����å�\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "������%d�Υ֥��å��򥹥��åפ��ޤ�\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "         ��������: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " �����åפ�����������: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "               �ɹ���: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     �������桼����ID: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ����������: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           ��������̾: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "       �����������˴�: %lu\n"
+msgstr "       �����������: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "       ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "       ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "               �ɹ���: %lu"
+msgstr "             ̤�ɹ���: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "��%08lX: �桼����ID������ޤ���\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/import.c:597
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "��%08lX: �����б���������������ޤ���\n"
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/import.c:612
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
-msgstr "��%08lX: ���ѤǤ���桼����ID������ޤ���\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "��%08lX: �桼����ID������ޤ���\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "��%08lX: HKP��������¤����\n"
 
-#: g10/import.c:621
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "��%08lX: ͭ���ʥ桼����ID������ޤ���\n"
+
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "`%s'�ؤν�Ф�\n"
+msgstr "��%s�פؤν�Ф�\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "����`%s'�ν���ߥ��顼: %s\n"
+msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "��%08lX: ��������%s�פ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "��%08lX: �������桼����ID��1��\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "��%08lX: ��%s�׿������桼����ID��1��\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "��%08lX: �������桼����ID��%d��\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "��%08lX: ��%s�׿������桼����ID��%d��\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "��%08lX: ��������̾��1��\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "��%08lX: ��%s�׿�������̾��1��\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "��%08lX: ��������̾��%d��\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "��%08lX: ��%s�׿�������̾��%d��\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "��%08lX: ������������1��\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "��%08lX: ��%s�׿�����������1��\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "��%08lX: ��%s�׿�����������%d��\n"
+
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "��%08lX: ������������%d��\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "��%08lX: ��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:774
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "��%08lX: �ѹ��ʤ�\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "��%08lX: ̵���ʰŹ�%d����̩���Ǥ� - �����å�\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr "��%08lX: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "��%08lX: ̵�����˴�������: %s - ����\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "��%08lX: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "��%08lX: �˴���������ɤ߹��ߤޤ���\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "��%08lX: ��%s�׼�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr ""
-"��%08lX: �桼����id \"%s\" �Υ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "��%08lX: �桼����id��%s�פΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "��%08lX: �桼����id��%s�פμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "��%08lX: �����б���������������ޤ���\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "��%08lX: ̵�����������б��Ǥ�\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "��%08lX: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "��%08lX: �����б���������������ޤ���\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "��%08lX: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "��%08lX: ̵�������������Ǥ�\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "��%08lX: ̵���������μ����������ޤ�\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "��%08lX: �����åפ����桼����ID '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "��%08lX: �����åפ�������\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "��%08lX: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "��%08lX: ̵���ʼ���������: %s - �����å�\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "��%08lX: ������̾�ξ�꤬�����äƤ��ޤ� - �����å�\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "��%08lX: ͽ�����̽�̾���饹 (0x%02X) - �����å�\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1698
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX�ΰ����Ф�\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX�ΰ����Ф�\n"
 
-#: g10/import.c:1403
+#: g10/import.c:1711
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX���Ժߡ�\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX���Ժߡ�\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "��%08lX: �˴���������ɲ�\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "��%08lX: ��%s�׼�����������ɲ�\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "��%08lX: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
-msgstr "[�˴�]"
+msgstr "[����]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "̵���ʽ�̾1��\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵���ʽ�̾%d��\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
-msgstr "�����ʤ�����1�Ĥν�̾�򸡾ڤ��ޤ���\n"
+msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
-msgstr "�����ʤ�����%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
+msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
-msgstr "���顼�Τ���1�Ĥν�̾�򸡾ڤ��ޤ���\n"
+msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "���顼�Τ���%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
+msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = �������ٿ��Ѥ���\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = �����˿��Ѥ���\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "�桼����ID \"%s\" ���˴�����Ƥ��ޤ���"
+msgstr "�桼����ID��%s�פϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�桼����ID��%s�פϡ������ڤ�Ǥ���"
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "�桼����ID��%s�פϡ����ʽ�̾����Ƥ��ޤ���"
+
+#: g10/keyedit.c:584
+#, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
-"������̾�Ǥ���\n"
+"\"%s\" �ˤ������뼫�ʽ�̾�ϡ�\n"
+"PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
+msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"��%s�פˤ������뺣�Τ��ʤ��ν�̾��\n"
+"�����ڤ�Ǥ���\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "�����ڤ��̾�򿷤�����̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2459,175 +2584,183 @@ msgstr ""
 "\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
 "������̾�Ǥ���\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "����Ǥ��̾�������Ǥ���? (y/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "���θ��ϴ����ڤ�Ǥ�!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s�Ǵ��¤��ڤ�ޤ���\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 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:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 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 ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
-"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ����\"0\"�����Ϥ��Ƥ���������\n"
+"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�פ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr "   (1) ��������ǧ���Ƥ��ޤ���%s\n"
+msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr "   (2) �������ǧ���ޤ�����%s\n"
+msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr "   (3) ���ʤ����դ��Ƴ�ǧ���ޤ�����%s\n"
+msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "�����? (�ܺ٤ϡ�?�פ�): "
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
+msgstr ""
+"\n"
+"���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
+"�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"��̾���˴��ԲĤ����ꤵ��ޤ���\n"
+"�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
+"��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"��̾���˴��ԲĤ����ꤵ��ޤ���\n"
+"��̾�ϼ����ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 "\n"
-"���θ�����������ǧ���Ƥ��ޤ���\n"
+"���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 "\n"
-"���θ��ϰ������ǧ���ޤ�����\n"
+"���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
-"���θ��ϡ����ʤ����դ��Ƴ�ǧ���ޤ�����\n"
+"���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "�����˽�̾���ޤ���? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2635,7 +2768,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2644,462 +2777,544 @@ msgstr ""
 "�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "�����˼¹Ԥ��ޤ���? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
-msgstr "���Υإ�פ򸫤�"
+msgstr "���Υإ�פ�ɽ��"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
-msgstr "����򸫤�"
+msgstr "�����ɽ��"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "����N������"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "ʬΥ��̾�����"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦���ؽ�̾"
+msgstr "�����Ǥ��ʤ��褦���ؽ�̾"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
+msgstr "�����Ǥ��ʤ��褦��������Ū�˽�̾"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "�桼����ID�κ��"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "������"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "addkey"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "�������ɲ�"
+msgstr "���������ɲ�"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������ΰ��������ؤ�"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "�������������"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "�����ΰ����򹹿�"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "�������С��Υ��顼"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "�������С���URI�������ǽ\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
-msgstr "��̾���˴�"
+msgstr "��̾�μ���"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "�桼����ID�μ���"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
-msgstr "�������˴�"
+msgstr "�������"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "��̩���֥��å�`%s'���ɹ��ߥ��顼: %s\n"
+msgstr "��̩���֥��å���%s�פ��ɹ��ߥ��顼: %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
-msgstr "�����˴�����Ƥ��ޤ���"
+msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "���������桼����ID�˽�̾���ޤ���? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����������˺�����ޤ���? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "���θ��������˺�����ޤ���? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "���򤷤����桼����ID�������˼������ޤ���? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "���Υ桼����ID�������˼������ޤ���? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
-msgstr "���򤷤������������˴����ޤ���? "
+msgstr "���򤷤����������˼������ޤ���? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
-msgstr "���θ����������˴����ޤ���? "
+msgstr "���θ��������˼������ޤ���? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "�������������"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "�����������˹������ޤ���? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "����: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "��ǽ: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
 msgid "This key may be revoked by %s key "
-msgstr "���θ���%s��%s%s�ˤ�ä��˴����줿�褦�Ǥ�\n"
+msgstr "���θ��ϡ�%s���ˤ�äƼ������줿�褦�Ǥ� "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (�ǥꥱ����)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, c-format
-msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "%s������Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[����] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [ͭ������: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [ͭ������: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! �������˴��ѤߤǤ�: %s\n"
+msgstr "rev! �����ϼ����ѤߤǤ�: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
-msgstr "rev- �Ǥä��������˴���ȯ��\n"
+msgstr "rev- �Ǥä������μ�����ȯ��\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? �˴���ǧ�㳲: %s\n"
+msgstr "rev? ���������㳲: %s\n"
 
-#: g10/keyedit.c:1837
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[����] "
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 #, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
+
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3107,7 +3322,23 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n"
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[����] "
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[��λ] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"�ٹ�: ��Ȥʤ�桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
+"              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
+
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3116,477 +3347,613 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n"
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
+"      ���θ�����ݤ��뤫�⤷��ޤ���\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ʤ����⤷��ޤ���\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "����Ĺ�������Ϥ��Ƥ�������"
+msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
+msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "�����ˤ��θ����̾�����Ԥ����ꤷ�ޤ���? (y/N): "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n"
+msgstr "�桼����id��%s�פ�v3���ʽ�̾��ȤФ��ޤ�\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "�桼����ID: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s������Ū�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "����Ǥ��˴��������Ǥ���? (y/N) "
+msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N) "
+msgstr "���ν�̾�ˤ������뼺�����������ޤ���? (y/N) "
 
-#. FIXME: detect duplicates here
-#: g10/keyedit.c:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
-msgstr "   %08lX��%s���˴�����Ƥ��ޤ�\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   %08lX��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
-msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
+msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   %08lX��%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "�˴�������������˺��ޤ���? (y/N) "
+msgstr "����������������˺��ޤ���? (y/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "�桼����ID��%s�פϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s�򥵥���%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "��̾�ݥꥷ��: "
+msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "��̾�ݥꥷ��: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "��̾����: "
+msgstr "����ƥ�����ʽ�̾����: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "��̾����: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "����"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [ͭ������: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[����] "
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "���Ȼ���ΰ���"
+msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "                ���� ="
+msgstr "�������:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "                ���� ="
+msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "                ���� ="
+msgstr " �������:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "                ���� ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "�����ʥѥ��ե졼���ޤ���̤�ΤΰŹ楢�르�ꥺ��Ǥ�(%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
-msgstr "%s�Ź沽���줿�ǡ���\n"
+msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "��������%08lX�Ǥ�\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ǰŹ沽���줿�ǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %08lX�ǰŹ沽%s�ˤǤ��ޤ���\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽���줿�ǡ�������\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
-
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "����: "
+msgstr "��Ω��������gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "�ݥꥷ��: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "�����ڤ�ν�̾ %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "       ��̾ \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
 msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "�ʲ��˸�������ޤ�: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "������ ��̾: \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "�����ڤ�ν�̾: \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "       ��̾ \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "�����ڤ�ν�̾ %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ�\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "�Х��ʥ꡼"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "�ƥ����ȥ⡼��"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "̤�Τ�"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
+msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "����������פ�̵���ˤǤ��ޤ���: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
-"���ΰŹ楢�르�ꥺ���ȿ�Ф���Ƥ��ޤ���\n"
+"���ΰŹ楢�르�ꥺ��ϡ�����뤵��Ƥ��ޤ���\n"
 "��ä�ɸ��Ū�ʥ��르�ꥺ����Ѥ��Ƥ�������!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+msgstr "�ٹ�: ��%s�פϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "\"--keyserver-options %s\"������˻ȤäƤ�������\n"
+msgstr "��%s%s�פ�����˻ȤäƤ�������\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "̤����"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "̤����"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "����μ���͡�%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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ楻�å���󸰤Ǥ�\n"
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg����������Ȥ�̵���Ǥ�\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "����������ȤΥ��饤�����pid������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "������������ѤΥ����С��ɽФ�FD������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "������������ѤΥ����С������FD������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�縰ID %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3597,32 +3964,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %08lX�������դ�%s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "�ѥ��ե졼��������\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "�ѥ��ե졼��������\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "�ѥ��ե졼����Ĺ�᤮�ޤ�\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "����������Ȥ����̵���ʱ���\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "�ѥ��ե졼��������: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3632,250 +4007,248 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "�ѥ��ե졼��������: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (�縰ID %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ץ��ץ�������Ѥ��Ƥ�������\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s'�κ������顼: %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɹ����� ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "ƿ̾�μ������ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "ƿ̾�μ�����ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "��λ��ƿ̾�μ������ѤǤ���\n"
+msgstr "��λ��ƿ̾�μ�����ѤǤ���\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK�ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "�ݸ�르�ꥺ��%d%s��̤�Τ������ԲĤǤ�\n"
+msgstr "�Ź楢�르�ꥺ��%d%s��̤�Τ������ԲĤǤ�\n"
 
-#: g10/pubkey-enc.c:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "��%08lX: �����˴��ѤߤǤ�!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "��%08lX��HKP�������С�%s���׵�\n"
+msgstr "����: ���ϼ����ѤߤǤ�"
 
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "`%s'�ؤ��������顼: %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "`%s'�ؤ����������� (����=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "\"%s\"��HKP�����С�%s���鸡��\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "�������С��򸡺��Ǥ��ޤ���: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "ȿ�Ф��줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
+msgstr "����뤵�줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
+msgstr "�ٹ�: ��̾�����󤬡���å�������̷�⤷�ޤ�\n"
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:102
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
-msgstr ""
-"�����PGP����������ElGamal���Ǥ���\n"
-"��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "������%08lX�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "������%08lX�ϡ���̾��%lu�����Ǥ�\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "����: ��̾��%08lX�ϴ����ڤ�Ǥ�%s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%08lX�ν�̾�������Ȥߤʤ��ޤ�\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:532
 #, fuzzy, c-format
-msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "��%08lX: �������ѥ��åȤˤ�����������������ޤ���\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "��%08lX: ���б��ؤν�̾���б���������������ޤ���\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:151
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
+
+#: g10/sign.c:112
 #, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "�������줿��̾�θ��ڤ˼���: %s\n"
+msgstr "�������줿��̾�θ����˼���: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "%s��̾����̾��: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s��̾����̾��: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǽ�̾�Ǥ�������Ǥ�\n"
+msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s������Ǥ��ޤ���: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
+msgstr "���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -3890,12 +4263,12 @@ msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϻ��ѤǤ��ޤ���\n"
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��� (n=%d): %s\n"
@@ -3904,195 +4277,265 @@ msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��� (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "���ѥǡ����١����Υȥ�󥶥�������礭�����ޤ�\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ���������Ǥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
-msgstr "%s: ���񤬤���ޤ���!\n"
+msgstr "%s: �ǥ��쥯�ȥ꡼������ޤ���!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: ���å����Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: ���å����Ǥ��ޤ���\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: �����Ǥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �С�����󡦥쥳���ɤκ����˼��Ԥ��ޤ���: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١��������\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "�ٹ�: ���ѥǡ����١��������������ǽ�Ǥ�\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "`%s' ���������緿��ID�Ǥ���ޤ���\n"
+msgstr "��%s�פϡ�ͭ�����緿��ID�Ǥ���ޤ���\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "��%08lX: ���Ѥ��븰�Ȥ��Ƽ������ޤ���\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "��%08lX�����ѥǡ����١�����ʣ������ޤ�\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "�� %08lX: ���Ѥ��븰�θ�����������ޤ��� - �����å�\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "���ѥ쥳����%lu, �ꥯ�����ȡ�������%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "���ѥ쥳����%lu, ������%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "̵����    "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
-msgstr "���ѥǡ����١����θ��ڤ����פǤ�\n"
+msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "���ѥǡ����١����μ���θ��ڤ�%s�Ǥ�\n"
+msgstr "���ѥǡ����١����μ���θ����ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:779
-msgid "checking the trustdb\n"
-msgstr "���ѥǡ����١����θ���\n"
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:933
-#, c-format
-msgid "public key %08lX not found: %s\n"
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
 msgstr "������%08lX�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:1515
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "���ѥǡ����١����θ���\n"
+
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%08lX�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
 #, 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"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "���ѥ쥳����%lu, ������%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/verify.c:108
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4102,7 +4545,7 @@ msgstr ""
 "(.sig��.asc)�����ޥ�ɹԤκǽ�Ǥʤ����\n"
 "�ʤ�ʤ����Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
@@ -4110,37 +4553,36 @@ msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 #: 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"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
 #: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "`%s'�򥹥��å�: ��ʣ\n"
+msgstr "��%s�פ򥹥��å�: ��ʣ\n"
 
 #: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
-msgstr "`%s'�򥹥��å�: %s\n"
+msgstr "��%s�פ򥹥��å�: %s\n"
 
 #: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
 msgstr "�����å�: ��̩���ϴ��ˤ���ޤ�\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"`%s'�򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
+"��%s�פ򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
 "��̾���Ѥ���ˤϡ������ǤϤ���ޤ���!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "�ե�����`%s'�ϴ���¸�ߤ��ޤ���"
+msgstr "�ե������%s�פϴ���¸�ߤ��ޤ���"
 
 #: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
@@ -4155,29 +4597,34 @@ msgstr "%s: ̤�Τγ�ĥ��\n"
 msgid "Enter new filename"
 msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "ɸ����Ϥ˽񤭽Ф��ޤ�\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "��̾���줿�ǡ�����`%s'�ˤ�������ꤷ�ޤ�\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: ���������ץ���󡦥ե����뤬�Ǥ��ޤ���\n"
+msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
-msgstr "%s: ���񤬤Ǥ��ޤ���: %s\n"
+msgstr "%s: �ǥ��쥯�ȥ꡼���Ǥ��ޤ���: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
-msgstr "%s: ���񤬤Ǥ��ޤ���\n"
+msgstr "%s: �ǥ��쥯�ȥ꡼���Ǥ��ޤ���\n"
 
 #: g10/encr-data.c:91
 msgid ""
@@ -4197,45 +4644,45 @@ msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(���뤤�ϡ�����Ǹ������)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "���θ����ؤ��������ޤ���? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "��ͭ�Կ��Ѿ���򥯥ꥢ���ޤ���\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "���θ������ˤ���������̩�� \"%s\" ������ޤ�!\n"
+msgstr "���θ������ˤ���������̩����%s�פ�����ޤ�!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ץ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4245,7 +4692,7 @@ msgstr ""
 "���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
 "(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4255,84 +4702,55 @@ msgstr ""
 "Web-of-Trust���ۤ��뤿��GnuPG�ϡ��ɤθ�������Ū�˿��Ѥ���\n"
 "�Τ����Τ�ɬ�פ�����ޤ�������ϤդĤ�����̩���˥��������Ǥ�\n"
 "�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
-"\"yes\"�Ȥ�����������������\n"
+"��yes�פ������Ƥ���������\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
-msgstr "�����˴����줿����Ȥ������ʤ���С���no�פ������Ƥ���������"
+msgstr "���μ������줿����Ȥ������ʤ���С���no�פ������Ƥ���������"
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�פ������Ƥ���������"
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "��å�������������ꥢ�ɥ쥹�Υ桼����ID�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"���Ѥ��륢�르�ꥺ������򤷤Ƥ���������\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (��̾DSS) �ϡ���̾�ˤΤ��Ѥ��뤳�Ȥ��Ǥ����Żҽ�̾���르��\n"
-"����Ǥ���DSA��̾��ElGamalˡ�����®�˸��ڤǤ���Τǡ������\n"
-"�侩���륢�르�ꥺ��Ǥ���\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal�ϡ���̾�ȰŹ沽���Ѥ��뤳�Ȥ��Ǥ��륢�르�ꥺ��Ǥ���\n"
-"OpenPGP�Ǥϡ����Υ��르�ꥺ��ΡְŹ沽�Τߡפȡֽ�̾+�Ź沽��\n"
-"��2�Ĥ���ˡ����̤��Ƥ��ޤ������ºݤˤ�Ʊ���Ǥ�������������̾��\n"
-"�ΰ����ʸ�����ˤϰ������ѿ������̤���ˡ�����򤷤ʤ���Фʤ�\n"
-"�ޤ��󡣤��Υץ������ǤϤ��줬��ǽ�Ǥ�����¾��OpenPGP�μ�����\n"
-"�ϡ��ֽ�̾+�Ź沽�פ���ˡ���ᤷ�ʤ����⤷��ޤ���\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ��󡣤��줬\n"
-"���Υ�˥塼�ˡְŹ沽�Τߡפ�ElGamal���Τʤ���ͳ�Ǥ���"
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"�����θ���RFC2440���������Ƥ��ޤ������侩���ޤ���\n"
-"�ʤ��ʤ顢�����򥵥ݡ��Ȥ��Ƥ��ʤ��ץ�����ब���ꡢ\n"
-"����������̾������Ĺ���ơ����ڤˤ���֤������뤿��Ǥ���"
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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 ""
+"���̤ˡ���̾�ȰŹ��Ʊ������Ȥ��Τϡ������������ޤ���\n"
+"���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
+"�ޤ����������ƥ���������Ȥˤ����̤���������"
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "����Ĺ�������Ϥ��Ƥ�������"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "��yes�פ���no�פ������Ƥ�������"
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4344,19 +4762,19 @@ msgstr ""
 "ɽ������ʤ��Ǥ��礦��������ꡢ�����ƥ�������ͤ���֤��Ѵ�����\n"
 "�褦�˻�ߤޤ���"
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "���ۥ����̾�������Ϥ��Ƥ�������"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4370,11 +4788,11 @@ msgstr ""
 "O  ����������³�ԡ�\n"
 "Q  ������������ߡ�"
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 msgstr "���������������硢��yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 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"
@@ -4427,13 +4845,13 @@ msgstr ""
 "    �桼�����θ��˽�̾������Ρ��֥ڥ륽�ʡ׳�ǧ�������Ǥ���\n"
 "\n"
 "\"2\" �ϡ����ʤ���������γ�ǧ�򤷤����Ȥ�����̣�Ǥ������Ȥ���\n"
-"    ���λ���򸡾ڤ����ե���ID�ˤ������Ƹ��Υ桼����ID���ǧ\n"
+"    ���λ���򸡾ڤ����ե���ID�ˤ������Ƹ��Υ桼����ID�򸡺�\n"
 "    ������礬�����Ǥ���\n"
 "\n"
 "\"3\" �ϡ����ʤ������ϰϤˤ錄�기�򸡾ڤ������Ȥ�����̣�Ǥ���\n"
 "    ���Ȥ��С����ν�ͭ���ܿͤȸ��λ���򸡾ڤ���(�ѥ��ݡ���\n"
 "    �Τ褦��) ��¤�Τ�Ĥ��������ե���ID�Ĥ��μ��ʤǡ����ν�\n"
-"    ͭ�Ԥ�̾���������Υ桼����ID��̾���Ȱ��פ��뤳�Ȥ��ǧ��\n"
+"    ͭ�Ԥ�̾���������Υ桼����ID��̾���Ȱ��פ��뤳�Ȥ򸡺���\n"
 "    �ơ�(�Żҥ᡼��θ򴹤ʤɤ�) �����Żҥ᡼�롦���ɥ쥹��\n"
 "    ���ν�ͭ�Ԥ�°���Ƥ��뤳�Ȥ򸡾ڤ�����礬�����Ǥ���\n"
 "\n"
@@ -4443,11 +4861,11 @@ msgstr ""
 "\n"
 "���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�פ������Ƥ�������"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4455,11 +4873,11 @@ msgstr ""
 "�����Υ桼����ID�������˺����������С���yes�פ������Ƥ���������\n"
 "�����������Ʊ���˺�����ޤ�!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "�����������������硢��yes�פ������Ƥ�������"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4469,19 +4887,19 @@ msgstr ""
 "�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
 "���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"���ν�̾�Ȱ��פ��븰����ͭ���Ƥ��ʤ��Τǡ����ν�̾�ϸ��ڤǤ��ޤ���\n"
+"���ν�̾�Ȱ��פ��븰����ͭ���Ƥ��ʤ��Τǡ����ν�̾�ϸ����Ǥ��ޤ���\n"
 "���θ������Ѥ����ޤǤϡ����ʤ��Ϥ��ν�̾�κ������α����٤��Ǥ���\n"
 "�ʤ��ʤ顢���ν�̾�θ��ϡ�¾�ξ������줿���ǿ��Ѥ��ؤ�������뤫��\n"
 "����ʤ�����Ǥ���"
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4489,7 +4907,7 @@ msgstr ""
 "���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
 "�Ȥ�����̣�Ǥ���"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4499,43 +4917,43 @@ msgid ""
 msgstr ""
 "����ϡ����Υ桼����ID���б�������̾�Ǥ����̾���ν�̾��������Τ�\n"
 "�����ͤ��ǤϤ���ޤ��󡣼ºݤˤϡ�GnuPG�Ϥ�Ϥ䤳�θ���Ȥ��ʤ��Τ���\n"
-"����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��̵���Ǥ��äơ�\n"
+"����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��ͭ���ǤϤʤ��ơ�\n"
 "���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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 ""
 "���� (�ޤ������򤷤�) �桼����ID�������򡢸��ߤ������������ѹ�\n"
-"���ޤ����ط����뼫�ʽ�̾�Υ����ॹ����פϡ�1�ä����ߤޤ���\n"
+"���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��񤭤��Ƥ褱��С���yes�פ������Ƥ�������"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 "�������ե�����̾�����Ϥ��Ƥ���������ñ�˥꥿���󡦥����򲡤��ȡ�\n"
-"(��̤ǰϤ��) ����Υե�����̾����Ѥ��ޤ���"
+"(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4564,108 +4982,657 @@ msgstr ""
 "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
 "      ���˻Ȥ��ޤ���\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 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 ""
-"�⤷������������С��ʤ��˴��������ȯ�Ԥ���Τ������������\n"
+"�⤷������������С��ʤ������������ȯ�Ԥ���Τ������������\n"
 "�����Ȥ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ƥ����Ȥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "�إ�פϤ���ޤ���"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
-msgstr "`%s'�Υإ�פϤ���ޤ���"
+msgstr "��%s�פΥإ�פϤ���ޤ���"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "����`%s'�κ������顼: %s\n"
+msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
-msgstr "���� `%s' ���Ǥ��ޤ���\n"
+msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "���ΰ�����η�٤������Ƥ�������\n"
 
-#: g10/keyring.c:1346
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "���ء�%s�פ򸡺����Ƥ��ޤ�\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+
+#: g10/photoid.c:65
 #, c-format
-msgid "checking keyring `%s'\n"
-msgstr "����`%s'�򸡾ڤ��Ƥ��ޤ�\n"
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"���ʤ��Υե���ID�˻Ȥ���������Ƥ���������������JPEG�ե�����Ǥ���ɬ\n"
+"�פ�����ޤ��������ϸ������Ȥ��ä���˳�Ǽ����롢�Ȥ������Ȥ�ǰƬ�ˤ�\n"
+"���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
+"�ޤ�! ���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
 
-#: g10/keyring.c:1377
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
+
+#: g10/photoid.c:87
 #, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "����ޤǤ�%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "�̿����%s�פ򳫤����Ȥ��Ǥ��ޤ���: %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
 
-#: g10/keyring.c:1388
+#: g10/photoid.c:112
 #, c-format
-msgid "%lu keys checked (%lu signatures)\n"
-msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "���μ̿����������Ǥ��� (y/N/q)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "�ե���ID��ɽ����ǽ!\n"
 
-#: g10/keyring.c:1453
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
+
+#: g10/exec.c:184
 #, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"���ץ���󡦥ե�����ε��ĥ⡼�ɤ��������ǤϤʤ��Τǡ�\n"
+"�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "�¹ԤǤ��ޤ��� %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "�����ץ������θƽФ��ǥ����ƥࡦ���顼: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "�����ץ�����ब���Լ����˽�λ\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "�����ץ������α������ɤ߹���ޤ���: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "̵����    "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "��%08lX: �桼����ID������ޤ���\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "������:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "���ν�̾�ˤ������뼺�����������ޤ���? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII�������Ϥ������ޤ���\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "����������������\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "��%s���Ѥμ������ϡ�����ޤ���\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "��̩����%s�פ����Ĥ���ޤ���: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "�б����������������ޤ���: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "����������̩�����ȹ礷�ޤ���!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"�����������������ޤ�����\n"
+"\n"
+"���Ĥ���ʤ��褦�����Τ˰�ư���Ƥ����������⤷��뤬���ξ�����ؤΥ�\n"
+"������������ȡ������Ĥ����ʤ��ξ������Ȥ��ʤ����뤳�Ȥ��Ǥ��ޤ���\n"
+"���Τ��ɽФ���ǽ�ˤʤä����������ơ����ξ��������������ݴɤ����\n"
+"�������Ǥ��������������դ��Ƥ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
+"����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "��������ͳ�����򤷤Ƥ�������:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "����󥻥�"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(�����ǤϤ��ä�%d�����Ӥޤ�)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "������ͳ: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(�����Ϥ���ޤ���)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "��������Ǥ���? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Sitei sareta sin'you no atai itiran %s\n"
+"# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "�ե����뤬�����ޤ���: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "�Ԥ�Ĺ�᤮�ޤ�\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "���顼: ������ȴ���Ƥ��ޤ�\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "���顼: ̵���ʻ���\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "���顼: ��ͭ�Ԥ��Ѥ����ͤ�����ޤ���\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "���ѥ쥳���ɤθ������顼: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "�ɹ��ߥ��顼: %s\n"
 
-#, fuzzy
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
-#~ msgstr "���ץ���󡦥ե�������ɤ�ľ���褦��GnuPG��Ƶ�ư���Ƥ�������\n"
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "�ٹ�: �����%s�פϡ�OpenPGP�ΰ����Ǥ���ޤ��󡣤����Ȥ���Ǥ�ǻȤ�������"
+#~ "��!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[�ե����뷲]|�ե����뷲��Ź沽"
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "`%s' �ؤε��Ĥ��ѹ��˼���: %s\n"
+#~ msgid "store only"
+#~ msgstr "��¸�Τ�"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[�ե����뷲]|�ե����뷲������"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "�����Ǥ��ʤ��褦���˽�̾"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "�����Ǥ��ʤ��褦��������Ū�˽�̾"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "�ѥ��å���Τߤΰ���"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "�����Ƥ��Ƥʤ����ѥǡ����١����򹹿�"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "���줿���ѥǡ����١�������"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr ""
+#~ "�ե�����ޤ���ɸ�����Ϥ�\n"
+#~ "��������"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr ""
+#~ "|̾��|����μ���ͤȤ���\n"
+#~ "��̾���פ����"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "����μ���ͤ˴���θ������"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "ü�����Ի���"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "����Ū��v3��̾"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "v3��̾�������ʤ�"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "����Ū��v4��̾"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "v4��̾�������ʤ�"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "�Ź沽�ˤϾ��MDC�����"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "gpg����������Ȥ����"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "�Хå����⡼��: ��ǧ��ά"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr ""
+#~ "�����Ƥ��μ����������yes\n"
+#~ "�Ȥߤʤ�"
+
+#~ msgid "assume no on most questions"
+#~ msgstr ""
+#~ "�����Ƥ��μ����������no\n"
+#~ "�Ȥߤʤ�"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "�����ˤ�����̩���ؤ��ɲ�"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "�����θ������븰�ؤ�ɽ��"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr ""
+#~ "|̾��|�������̩���Ȥ���\n"
+#~ "��̾���פ����"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|̾��=��|��������ǡ��������"
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|�ۥ���|���θ����ˤ��θ������С������"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr ""
+#~ "|CHARSET̾|ü����charset���CHARSET̾��\n"
+#~ "������"
+
+#~ msgid "read options from file"
+#~ msgstr ""
+#~ "�ե����뤫�饪�ץ�����\n"
+#~ "�ɤ߹���"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr ""
+#~ "|�ե�����|���ơ����������ե������\n"
+#~ "�񤭽Ф�"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|��ID|���θ�������Ū�˿��Ѥ���"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr ""
+#~ "|�ե�����|��ĥ�⥸�塼��Υե������\n"
+#~ "�ɤ߹���"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr ""
+#~ "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
+#~ "����"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "�ѥ��åȤȰŹ������Υ��ץ���\n"
+#~ "�������OpenPGP��������"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "�ѥ��åȤȰŹ������Υ��ץ���\n"
+#~ "�������PGP 2.x��������"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|�ѥ��ե졼�����⡼��N�����"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
+#~ "���������󥢥르�ꥺ������"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
+#~ "���르�ꥺ������"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr ""
+#~ "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
+#~ "����"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr ""
+#~ "|̾��|��̾���פΥ�å���������\n"
+#~ "���르�ꥺ������"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr ""
+#~ "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
+#~ "����"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr ""
+#~ "�Ź�ѥ��åȤθ�ID�ե������\n"
+#~ "������"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "�ե���ID��ɽ��"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "�ե���ID��ɽ�����ʤ�"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr ""
+#~ "�ե���ID��������륳�ޥ�ɹ�\n"
+#~ "������"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "���̥��르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: ���θ��ϼºݤ��ܿͤΤ�Τ��������Ǥ�����\n"
+#~ "���������������ޤ�\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "����%c%lu��ͭ���ǤϤ���ޤ���\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr "����: ElGamal�μ縰�򸡽� - �����ˤ����ɹ��ߤ˻��֤�������ޤ�\n"
+
+#~ msgid " (default)"
+#~ msgstr " (����)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "����: "
+
+#~ msgid "Policy: "
+#~ msgstr "�ݥꥷ��: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "��%08lX��%s���׵�\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "`%s'�ؤ��������顼: %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "`%s'�ؤ����������� (����=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "���θ������С��ϡ�--search-keys�򥵥ݡ��Ȥ��ޤ���\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "��%s�פ�HKP�����С�%s���鸡��\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "�������С��򸡺��Ǥ��ޤ���: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "��%08lX: ����ϡ�PGP����������ElGamal�Ǥ���\n"
+#~ "��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
 
 #~ msgid ""
-#~ "the first character of a notation name must be a letter or an underscore\n"
-#~ msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr "��%08lX�ϡ�%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#~ msgid "dots in a notation name must be surrounded by other characters\n"
-#~ msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr "��%08lX�ϡ�%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "����Ū�˿��Ѥ������Ȥ��Ƹ� %08lX ��Ͽ���ޤ���\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "ElGamal��̾�� %08lX ���� %08lX �ޤǤν�̾�򥹥��å�\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "%08lX ����ElGamal��̾�� %08lX �ޤǤν�̾�򥹥��å�\n"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "���Ѥ��륢�르�ꥺ������򤷤Ƥ���������\n"
+#~ "\n"
+#~ "DSA (��̾DSS) �ϡ���̾�ˤΤ��Ѥ��뤳�Ȥ��Ǥ����Żҽ�̾���르��\n"
+#~ "����Ǥ���DSA��̾��ElGamalˡ�����®�˸��ڤǤ���Τǡ������\n"
+#~ "�侩���륢�르�ꥺ��Ǥ���\n"
+#~ "\n"
+#~ "ElGamal�ϡ���̾�ȰŹ沽���Ѥ��뤳�Ȥ��Ǥ��륢�르�ꥺ��Ǥ���\n"
+#~ "OpenPGP�Ǥϡ����Υ��르�ꥺ��ΡְŹ沽�Τߡפȡֽ�̾+�Ź沽��\n"
+#~ "��2�Ĥ���ˡ����̤��Ƥ��ޤ������ºݤˤ�Ʊ���Ǥ�������������̾��\n"
+#~ "�ΰ����ʸ�����ˤϰ������ѿ������̤���ˡ�����򤷤ʤ���Фʤ�\n"
+#~ "�ޤ��󡣤��Υץ������ǤϤ��줬��ǽ�Ǥ�����¾��OpenPGP�μ�����\n"
+#~ "�ϡ��ֽ�̾+�Ź沽�פ���ˡ���ᤷ�ʤ����⤷��ޤ���\n"
+#~ "\n"
+#~ "�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ��󡣤��줬\n"
+#~ "���Υ�˥塼�ˡְŹ沽�Τߡפ�ElGamal���Τʤ���ͳ�Ǥ���"
 
 #~ msgid ""
-#~ "WARNING: This key already has a photo ID.\n"
-#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "�ٹ�: ���θ��ˤϤ⤦�ե���ID������ޤ���\n"
-#~ "      �㤦�ե���ID���ɲä���ȡ��������Ǥ�PGP�Ϻ��𤹤뤫�⤷��ޤ���\n"
+#~ "�����θ���RFC2440���������Ƥ��ޤ������侩���ޤ���\n"
+#~ "�ʤ��ʤ顢�����򥵥ݡ��Ȥ��Ƥ��ʤ��ץ�����ब���ꡢ\n"
+#~ "����������̾������Ĺ���ơ����ڤˤ���֤������뤿��Ǥ���"
 
-#~ msgid "You may only have one photo ID on a key.\n"
-#~ msgstr "1�ܤθ��ˤϥե���ID��ҤȤ��դ���������Ǥ���\n"
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "����ޤǤ�%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
 
-#~ msgid "Fingerprint:"
-#~ msgstr "����:"
+#~ msgid "key incomplete\n"
+#~ msgstr "�Դ����ʸ�\n"
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "                    ����:"
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "��%08lX: �Դ���\n"
diff --git a/po/nl.po b/po/nl.po
index 383952501..be7376702 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,58 +1,77 @@
-# Dutch messages for gnupg
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Ivo Timmermans <[email protected]>, 2000.
-#
+# Dutch translation of gnupg.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnupg package.
+# Elros Cyriatan <[email protected]>, 2004.
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2000-02-20 21:30+01:00\n"
-"Last-Translator: Ivo Timmermans <[email protected]>\n"
-"Language-Team: Dutch <[email protected]>\n"
+"Project-Id-Version: gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-05-10 19:23+0200\n"
+"Last-Translator: Elros Cyriatan <[email protected]>\n"
+"Language-Team: Dutch <[email protected]>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "Let op: er wordt onveilig geheugen gebruikt!\n"
+msgstr "WAARSCHUWING: er wordt onveilig geheugen gebruikt!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr ""
+msgstr "zie alstublieft http://www.gnupg.org/faq.html voor meer informatie\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n"
+msgstr "bewerking is niet mogelijk zonder geïnitialiseerd veilig geheugen\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n"
+msgstr "(mogelijk heeft u het verkeerde programma gebruikt voor deze taak)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
-msgstr "yYjJ"
+msgstr "jJ"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nee"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
-msgstr "einde"
+msgstr "afsluiten"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
-msgstr "qQeE"
+msgstr "qQ"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
 
 #: util/errors.c:54
 msgid "general error"
@@ -60,7 +79,7 @@ msgstr "algemene fout"
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "onbekend pakket type"
+msgstr "onbekende pakketsoort"
 
 #: util/errors.c:56
 msgid "unknown version"
@@ -68,39 +87,39 @@ msgstr "onbekende versie"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "onbekend publieke sleutel algoritme"
+msgstr "onbekend openbare sleutel algoritme"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "onbekend verteeralgoritme"
+msgstr "onbekend digest-algoritme"
 
 #: util/errors.c:59
 msgid "bad public key"
-msgstr "foutieve publieke sleutel"
+msgstr "slechte openbare sleutel"
 
 #: util/errors.c:60
 msgid "bad secret key"
-msgstr "foutieve geheime sleutel"
+msgstr "slechte geheime sleutel"
 
 #: util/errors.c:61
 msgid "bad signature"
-msgstr "foutieve ondertekening"
+msgstr "slechte ondertekening"
 
 #: util/errors.c:62
 msgid "checksum error"
-msgstr "verkeerd controlegetal"
+msgstr "controlesom fout"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "verkeerde sleuteltekst"
+msgstr "slecht wachtwoord"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "publieke sleutel niet gevonden"
+msgstr "openbare sleutel niet gevonden"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "onbekend versleutelalgoritme"
+msgstr "onbekend codeeralgoritme"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
@@ -112,11 +131,11 @@ msgstr "ongeldig pakket"
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "ongeldige versleuteling"
+msgstr "ongeldige bepantsering"
 
 #: util/errors.c:69
 msgid "no such user id"
-msgstr "niet-bestaand gebruikersnummer"
+msgstr "onbekende gebruikerscode"
 
 #: util/errors.c:70
 msgid "secret key not available"
@@ -132,55 +151,55 @@ msgstr "niet ondersteund"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "foutieve sleutel"
+msgstr "slechte sleutel"
 
 #: util/errors.c:74
 msgid "file read error"
-msgstr "leesfout op bestand"
+msgstr "bestandsleesfout"
 
 #: util/errors.c:75
 msgid "file write error"
-msgstr "schrijffout op bestand"
+msgstr "bestandsschrijffout"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "onbekend compressiealgoritme"
+msgstr "onbekend inpakalgoritme"
 
 #: util/errors.c:77
 msgid "file open error"
-msgstr "fout bij openen bestand"
+msgstr "bestandsopenfout"
 
 #: util/errors.c:78
 msgid "file create error"
-msgstr "fout bij aanmaken bestand"
+msgstr "bestandsaanmaakfout"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "ongeldige sleuteltekst"
+msgstr "ongeldig wachtwoord"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "publieke sleutel algoritme niet ge�mplementeerd"
+msgstr "niet-geïmplementeerd openbare sleutel algoritme"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "encryptie-algoritme niet ge�mplementeerd"
+msgstr "niet-geïmplementeerd codeeralgoritme"
 
 #: util/errors.c:82
 msgid "unknown signature class"
-msgstr "onbekende klasse van ondertekeningen"
+msgstr "onbekende ondertekeningsklasse"
 
 #: util/errors.c:83
 msgid "trust database error"
-msgstr "fout in de vertrouwensrelatiedatabase"
+msgstr "vertrouwensgegevensbank fout"
 
 #: util/errors.c:84
 msgid "bad MPI"
-msgstr "foutieve MPI"
+msgstr "slechte MPI"
 
 #: util/errors.c:85
 msgid "resource limit"
-msgstr "hulpbronlimiet"
+msgstr "grens aan bronnen"
 
 #: util/errors.c:86
 msgid "invalid keyring"
@@ -188,23 +207,23 @@ msgstr "ongeldige sleutelbos"
 
 #: util/errors.c:87
 msgid "bad certificate"
-msgstr "foutief certificaat"
+msgstr "slecht certificaat"
 
 #: util/errors.c:88
 msgid "malformed user id"
-msgstr "ongeldige gebruikersidentificatie"
+msgstr "misvormde gebruikerscode"
 
 #: util/errors.c:89
 msgid "file close error"
-msgstr "fout bij het sluiten van het bestand"
+msgstr "bestandssluitfout"
 
 #: util/errors.c:90
 msgid "file rename error"
-msgstr "fout bij het hernoemen van het bestand"
+msgstr "bestandshernoemfout"
 
 #: util/errors.c:91
 msgid "file delete error"
-msgstr "fout bij het verwijderen van het bestand"
+msgstr "bestandsverwijderfout"
 
 #: util/errors.c:92
 msgid "unexpected data"
@@ -212,19 +231,19 @@ msgstr "onverwachte gegevens"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
-msgstr "tijden komen niet overeen"
+msgstr "tijdsstempel conflict"
 
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
-msgstr "onbruikbaar publieke sleutel-algoritme"
+msgstr "onbruikbar openbare sleutel algoritme"
 
 #: util/errors.c:95
 msgid "file exists"
-msgstr "bestand bestaat al"
+msgstr "bestand bestaat"
 
 #: util/errors.c:96
 msgid "weak key"
-msgstr "onveilige sleutel"
+msgstr "zwakke sleutel"
 
 #: util/errors.c:97
 msgid "invalid argument"
@@ -232,11 +251,11 @@ msgstr "ongeldig argument"
 
 #: util/errors.c:98
 msgid "bad URI"
-msgstr "foutieve URI"
+msgstr "slechte URI"
 
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "URI wordt niet ondersteund"
+msgstr "niet-ondersteunde URI"
 
 #: util/errors.c:100
 msgid "network error"
@@ -244,93 +263,101 @@ msgstr "netwerkfout"
 
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "niet versleuteld"
+msgstr "niet gecodeerd"
 
 #: util/errors.c:103
 msgid "not processed"
-msgstr "niet behandeld"
+msgstr "niet verwerkt"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
-msgstr "foutieve publieke sleutel"
+msgstr "onbruikbare openbare sleutel"
 
 #: util/errors.c:106
 msgid "unusable secret key"
-msgstr "foutieve geheime sleutel"
+msgstr "onbruikbare geheime sleutel"
 
 #: util/errors.c:107
-#, fuzzy
 msgid "keyserver error"
-msgstr "algemene fout"
+msgstr "sleutelserverfout"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
+msgstr "... dit is een softwarefout (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
-msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
+msgstr "u heeft een softwarefout gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "geen entropie verzamelende module gevonden\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:385
-#, fuzzy, c-format
+#: cipher/random.c:391
+#, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "kan `%s' niet openen: %s\n"
+msgstr "kan `%s' niet vinden: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr ""
+msgstr "`%s' is geen gewoon bestand - genegeerd\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
-msgstr ""
+msgstr "let op: random_seed bestand is leeg\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "LET OP: ongeldige aantekeningen gevonden\n"
+msgstr ""
+"WAARSCHUWING: ongeldige grootte van random_seed bestand - niet gebruikt\n"
 
-#: cipher/random.c:409
-#, fuzzy, c-format
+#: cipher/random.c:415
+#, c-format
 msgid "can't read `%s': %s\n"
-msgstr "kan `%s' niet openen: %s\n"
+msgstr "kan `%s' niet lezen: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
-msgstr ""
+msgstr "let op: random_seed bestand niet bijgewerkt\n"
 
-#: cipher/random.c:467
-#, fuzzy, c-format
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
 msgid "can't create `%s': %s\n"
-msgstr "kan %s niet aanmaken: %s\n"
+msgstr "kan `%s' niet aanmaken: %s\n"
 
-#: cipher/random.c:474
-#, fuzzy, c-format
+#: cipher/random.c:480
+#, c-format
 msgid "can't write `%s': %s\n"
-msgstr "kan `%s' niet openen: %s\n"
+msgstr "kan `%s' niet schrijven: %s\n"
 
-#: cipher/random.c:477
-#, fuzzy, c-format
+#: cipher/random.c:483
+#, c-format
 msgid "can't close `%s': %s\n"
-msgstr "kan `%s' niet openen: %s\n"
+msgstr "kan `%s' niet sluiten: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
+msgstr ""
+"WAARSCHUWING: er wordt een onveilige willekeurige getallen generator "
+"gebruikt!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,10 +365,10 @@ msgid ""
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"De willekeurige getallengenerator is slechts een slordige oplossing om\n"
-"het te laten werken - het is in geen geval een echte WGG!\n"
+"De willekeurige getallen generator is slechts profisorisch bedoeld om het\n"
+"programma te laten werken - hij is zeker niet goed!\n"
 "\n"
-"Gebruik geen enkele gegevens die door dit programma gegenereerd zijn!!\n"
+"GEBRUIK GEEN GEGEVENS DIE GEGENEREERD ZIJN DOOR DIT PROGRAMMA!!\n"
 "\n"
 
 #: cipher/rndlinux.c:134
@@ -352,11 +379,36 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 "\n"
-"Niet genoeg willekeurige gegevens beschikbaar.  Ga wat ander werk doen\n"
-"om het besturingssysteem de kans te geven om meer entropie te\n"
-"verzamelen! (Nog %d bytes nodig)\n"
+"Onvoldoende willekeurige bytes beschikbaar.  Doe alstublieft wat ander werk\n"
+"om het besturingssysteem de kans te geven om meer entropie te verzamelen!\n"
+"(Er zijn nog %d bytes nodig)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "digest-algoritme `%s' is alleen-lezen in deze uitgave\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Even geduld alstublieft, er wordt entropie verzameld. Doe wat werk\n"
+"als u dan niet verveeld raakt, want het verbeterd de kwaliteit van de\n"
+"entropie.\n"
+
+#: cipher/primegen.c:120
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr ""
 
-#: g10/g10.c:307
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -364,170 +416,128 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
-msgstr "|[bestand]|maak een ondertekening"
+msgstr "|[bestand]|een ondertekening maken"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
-msgstr "|[bestand]|maak een niet versleutelde ondertekening"
+msgstr "|[bestand]|een niet-gecodeerde ondertekening maken"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
-msgstr "maak een losstaande ondertekening"
+msgstr "een losse ondertekening maken"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
-msgstr "versleutel gegevens"
+msgstr "gegevens coderen"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr ""
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
-msgstr "versleutel slechts met een symmetrische versleutelmethode"
+msgstr "slechts met symmetrische codering coderen"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "alleen bewaren"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr ""
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
-msgstr "ondertekening controleren"
+msgstr "een ondertekening controleren"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
-msgstr "lijst van sleutels genereren"
+msgstr "sleutels opsommen"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
-msgstr "sleutels en ondertekeningen opnoemen"
+msgstr "sleutels en ondertekeningen opsommen"
 
-#: g10/g10.c:323
-msgid "check key signatures"
-msgstr "sleutelverificaties controleren"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "sleutelondertekeningen controleren"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
-msgstr "sleutels en vingerafdrukken opnoemen"
+msgstr "sleutels en vingerafdrukken opsommen"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
-msgstr "geheime sleutels opnoemen"
+msgstr "geheime sleutels opsommen"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
-msgstr "nieuw sleutelpaar genereren"
+msgstr "een nieuw sleutelpaar genereren"
 
-#: g10/g10.c:327
-#, fuzzy
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
-msgstr "sleutel weghalen uit de publieke sleutelbos"
+msgstr "sleutels uit de openbare sleutelbos verwijderen"
 
-#: g10/g10.c:329
-#, fuzzy
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
-msgstr "sleutel weghalen uit de geheime sleutelbos"
+msgstr "sleutels uit de geheime sleutelbos verwijderen"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
-msgstr "onderteken een sleutel"
+msgstr "een sleutel ondertekenen"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
-msgstr "onderteken een sleutel lokaal"
+msgstr "een sleutel lokaal ondertekenen"
 
-#: g10/g10.c:332
-#, fuzzy
-msgid "sign a key non-revocably"
-msgstr "onderteken een sleutel lokaal"
-
-#: g10/g10.c:333
-#, fuzzy
-msgid "sign a key locally and non-revocably"
-msgstr "onderteken een sleutel lokaal"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
-msgstr "onderteken of bewerk een sleutel"
+msgstr "een sleutel ondertekenen of bewerken"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
-msgstr "genereer een terugtrekkings-certificaat"
+msgstr "een herroepingscertificaat genereren"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
-msgstr "exporteer sleutels"
+msgstr "sleutels uitvoeren"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
-msgstr "exporteer sleutels naar een sleutelserver"
+msgstr "sleutels uitvoeren naar een sleutelserver"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
-msgstr "importeer sleutels van een sleutelserver"
+msgstr "sleutels invoeren van een sleutelserver"
 
-#: g10/g10.c:341
-#, fuzzy
+#: g10/g10.c:388
 msgid "search for keys on a key server"
-msgstr "exporteer sleutels naar een sleutelserver"
+msgstr "zoeken naar sleutels op een sleutelserver"
 
-#: g10/g10.c:343
-#, fuzzy
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
-msgstr "importeer sleutels van een sleutelserver"
+msgstr "alle sleutels bijwerken vanaf een sleutelserver"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
-msgstr "sleutels importeren/samenvoegen"
+msgstr "sleutels invoeren/samenvoegen"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "noem alleen de volgorde van pakketten"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "exporteer het vertrouwen in de eigenaars"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importeer het vertrouwen in de eigenaars"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
-msgstr "werk de vertrouwensdatabase bij"
+msgstr "de vertrouwensgegevensbank bijwerken"
 
-#: g10/g10.c:357
-#, fuzzy
-msgid "unattended trust database update"
-msgstr "werk de vertrouwensdatabase bij"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "repareer een beschadigde vertrouwensdatabase"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "Verwijder de beveiliging op bestand of standaard invoer"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
-msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
+msgstr "|algoritme [bestanden]|berichtdigest weergeven"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -537,208 +547,64 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
-msgstr "genereer beveiliging in ASCII"
+msgstr "ASCII-bepantserde uitvoer maken"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
-msgstr "|NAAM|versleutel voor NAAM"
-
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "gebruik de standaard sleutel als standaard ontvanger"
+msgstr "|NAAM|coderen voor NAAM"
 
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
-msgstr ""
-"gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
+msgstr "deze gebruikerscode gebruiken om te ondertekenen of decoderen"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
+msgstr "|N|inpakniveau N instellen (0 zet dit uit)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
-msgstr "gebruik de verkorte tekstmodus"
+msgstr "kanonieke tekstmodus gebruiken"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
-msgstr "gebruik als uitvoerbestand"
+msgstr "gebruiken als uitvoerbestand"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
-msgstr "geef meer informatie"
-
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "wees iets stiller"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "gebruik de terminal helemaal niet"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "forcees v3 ondertekening"
-
-#: g10/g10.c:397
-#, fuzzy
-msgid "do not force v3 signatures"
-msgstr "forcees v3 ondertekening"
-
-#: g10/g10.c:398
-#, fuzzy
-msgid "force v4 key signatures"
-msgstr "forcees v3 ondertekening"
-
-#: g10/g10.c:399
-#, fuzzy
-msgid "do not force v4 key signatures"
-msgstr "forcees v3 ondertekening"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "gebruik altijd een MDC voor versleuteling"
+msgstr "breedsprakig"
 
-#: g10/g10.c:402
-#, fuzzy
-msgid "never use a MDC for encryption"
-msgstr "gebruik altijd een MDC voor versleuteling"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
-msgstr "maak geen enkele verandering"
+msgstr "geen wijzigingen maken"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
+msgstr "vragen alvorens te overschrijven"
 
-#: g10/g10.c:406
-msgid "use the gpg-agent"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "doorlopende modus: vraag nooit"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "veronderstel ja als antwoord op de meeste vragen"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "veronderstel nee als antwoord op de meeste vragen"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "voeg deze geheime sleutelbos toe aan de lijst"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "lees opties uit bestand"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
-
-#: g10/g10.c:427
-#, fuzzy
-msgid "|[file]|write status info to file"
-msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr ""
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|BESTAND|laad extensiemodule BESTAND"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "doe als RFC1991 voorschrijft"
-
-#: g10/g10.c:442
-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:443
-#, 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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|gebruik sleuteltekst modus N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|gebruik compressiealgoritme N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr ""
-
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr ""
-
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
+"@\n"
+"(Zie de man-handleiding voor een volledige lijst met alle opdrachten en "
+"opties)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -752,33 +618,33 @@ msgstr ""
 "@\n"
 "Voorbeelden:\n"
 "\n"
-" -se -r Bob [bestand]        teken en versleutel voor Bob\n"
-" --clearsign [bestand]       genereer een leesbare ondertekening\n"
-" --detach-sign [bestand]     genereer een losstaande ondertekening\n"
-" --list-keys [namen]         toon sleutels\n"
-" --fingerprints [namen]      toon vingerafdrukken\n"
+" -se -r Bob [bestand]       ondertekenen en coderen voor gebruiker Bob\n"
+" --clearsign [bestand]      een niet-gecodeerde ondertekening maken\n"
+" --detach-sign [bestand]    een losse ondertekening maken\n"
+" --list-keys [namen]        sleutels weergeven\n"
+" --fingerprint [namen]      vingerafdrukken weergeven\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
-"Meld fouten in het programma a.u.b. aan <[email protected]>;\n"
-"fouten in de vertaling aan <[email protected]>.\n"
+"Rapporteer softwarefouten alstublieft aan <[email protected]>.\n"
+"Rapporteer fouten in de vertaling alstublieft aan <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
 "Syntaxis: gpg [opties] [bestanden]\n"
-"onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
-"standaardactie hangt af van de gegevens\n"
+"ondertekenen, controleren, coderen of decoderen\n"
+"standaardbewerking hangt af van invoergegevens\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -786,799 +652,999 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Openbare sleutel: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Codering: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Compressie: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
-msgstr "tegenstrijdige commando's\n"
+msgstr "conflicterende opdrachten\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "geen =-teken gevonden in groepdefinitie \"%s\"\n"
 
-#: g10/g10.c:983
-#, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
 
-#: g10/g10.c:986
-#, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
 
-#: g10/g10.c:989
-#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "WAARSCHUWING: onveilig eigendom op %s \"%s\"\n"
 
-#: g10/g10.c:993
-#, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "WAARSCHUWING: onveilige toegangsrechten op %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "WAARSCHUWING: onveilig omsluitend mapeigendom op %s \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1202
 #, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "WAARSCHUWING: onveilige omsluitende maptoegangsrechten op %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "nieuw configuratiebestand `%s' aangemaakt\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "LET OP: geen bestand `%s' met standaardopties\n"
+msgstr "LET OP: oude bestand voor standaard opties `%s' genegeerd\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "LET OP: geen bestand `%s' met standaardopties\n"
+msgstr "LET OP: geen bestand voor standaard opties `%s'\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "opties inlezen van `%s'\n"
+msgstr "bezig met lezen opties uit `%s'\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "LET OP: %s is niet voor normaal gebruik!\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
+"coderingsuitbreiding \"%s\" niet geladen vanwege onveilige toegangsrechten\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
-msgstr "%s is een onbekende tekenverzameling\n"
+msgstr "%s is geen geldige tekenset\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
-msgstr ""
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "kon sleutelserver URI niet inlezen\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "LET OP: `%s' is een leeg bestand\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: ongeldige uitvoeropties\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "ongeldige uitvoeropties\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: ongeldige invoeropties\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "ongeldige versleuteling"
+msgstr "ongeldige invoeropties\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "LET OP: `%s' is een leeg bestand\n"
+msgstr "%s:%d: ongeldige uitvoeropties\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "ongeldige sleutelbos"
+msgstr "ongeldige uitvoeropties\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: ongeldige invoeropties\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "ongeldige invoeropties\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: ongeldige uitvoeropties\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "ongeldige uitvoeropties\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr ""
+msgstr "kan exec-path niet instellen op %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
-msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
+msgstr "WAARSCHUWING: programma maakt mogelijk een core-bestand aan!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr ""
+msgstr "WAARSCHUWING: %s gaat boven %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s is niet toegestaan met deze %s!\n"
+msgstr "%s niet toegestaan met %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s heeft geen betekenis met %s!\n"
+msgstr "%s slaat nergens op met %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
+"u kunt alleen losse of ongecodeerde ondertekeningen maken in --pgp2 modus\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr ""
+msgstr "u kunt niet tegelijkertijd ondertekenen en coderen in --pgp2 modus\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr ""
+msgstr "u dient bestanden te gebruiken (en niet een pijp) in --pgp2 modus.\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr ""
+msgstr "het coderen van een bericht in --pgp2 modus vereist de IDEA-codering\n"
 
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr ""
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
-msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
+msgstr "het gekozen coderingsalgoritme is ongeldig\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
-msgstr "geselecteerd controle-algoritme is ongeldig\n"
+msgstr "het gekozen digest-algoritme is ongeldig\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "geselecteerd controle-algoritme is ongeldig\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "het gekozen coderingsalgoritme is ongeldig\n"
 
-#: g10/g10.c:1845
-#, 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:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "het gekozen certificaat-digest-algoritme is ongeldig\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed(?) moet groter zijn dan 0\n"
+msgstr "completes-needed moet groter zijn dan 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-needed(?) moet groter zijn dan 1\n"
+msgstr "marginals-needed moet groter zijn dan 1\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth moet binnen het bereik 1 tot 255 vallen\n"
 
-#: g10/g10.c:1851
-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:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "ongeldig standaard controleniveau; moet 0, 1, 2 of 3 zijn\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
+msgstr "LET OP: eenvoudige S2K-modus (0) wordt sterk ontraden\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
+msgstr "ongeldige S2K-modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1862
-#, 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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "toon voorkeuren"
+msgstr "ongeldige standaardvoorkeuren\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "toon voorkeuren"
+msgstr "ongeldige persoonlijke coderingsvoorkeuren\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "toon voorkeuren"
+msgstr "ongeldige persoonlijke digestvoorkeuren\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "toon voorkeuren"
+msgstr "ongeldige persoonlijke inpakvoorkeuren\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2633
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s slaat nergens op met %s!\n"
+
+#: g10/g10.c:2680
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "u kunt %s niet gebruiken in %s modus\n"
+
+#: g10/g10.c:2685
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "u kunt %s niet gebruiken in %s modus\n"
+
+#: g10/g10.c:2690
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "u kunt %s niet gebruiken in %s modus\n"
+
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
-msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
+msgstr "initialiseren van vertrouwensgegevensbank mislukt: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"WAARSCHUWING: ontvangers (-r) gegeven zonder gebruik te maken van openbare "
+"sleutel codering\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [bestandsnaam]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "u kunt %s niet gebruiken in %s modus\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
 #, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [bestandsnaam]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "u kunt %s niet gebruiken in %s modus\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
-msgstr "--symmetric [bestandsnaam]"
+msgstr "--sign --symmetric [bestandsnaam]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
-msgstr "--sign-key gebruikersidentificatie"
+msgstr "--sign-key gebruikerscode"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
-msgstr "--lsign-key gebruikers-identificatie"
+msgstr "--lsign-key gebruikerscode"
 
-#: g10/g10.c:2110
-#, fuzzy
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
-msgstr "--sign-key gebruikersidentificatie"
+msgstr "--nrsign-key gebruikerscode"
 
-#: g10/g10.c:2118
-#, fuzzy
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
-msgstr "--sign-key gebruikersidentificatie"
+msgstr "--nrlsign-key gebruikerscode"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
-msgstr "--edit-key gebruikersidentificatie [opdrachten]"
+msgstr "--edit-key gebruikerscode [opdrachten]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
+msgstr "-k[v][v][v][c] [gebruikerscode] [sleutelbos]"
+
+#: g10/g10.c:3094
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3096
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Sleutelaanmaak mislukt: %s\n"
+
+#: g10/g10.c:3098
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Sleutelaanmaak mislukt: %s\n"
+
+#: g10/g10.c:3109
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Sleutelaanmaak mislukt: %s\n"
+
+#: g10/g10.c:3119
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "bijwerken geheim mislukt: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "opheffen van beveiliging mislukt: %s\n"
+msgstr "ontpantseren mislukt: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "beveiligen mislukt: %s\n"
+msgstr "bepantseren mislukt: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "ongeldig frommelalgoritme `%s'\n"
+msgstr "ongeldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 msgid "Go ahead and type your message ...\n"
-msgstr "Gaat uw gang, type het bericht ...\n"
+msgstr "Ga uw gang en typ uw bericht...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"een notatienaam mag slechts afdrukbare tekens of spaties bevatten, en moet "
+"eindigen met een '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "een gebruikersnotatienaam moet het '@'-teken bevatten\n"
+
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
-msgstr "een notitienaam mag geen controletekens bevatten\n"
+msgstr "een notatiewaarde mag geen stuurtekens bevatten\n"
 
-#: g10/g10.c:2737
-#, fuzzy
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
-msgstr "de gegeven beleids-URL is ongeldig\n"
+msgstr "de gegeven certificatiebeleid URL is ongeldig\n"
 
-#: g10/g10.c:2739
-#, fuzzy
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
-msgstr "de gegeven beleids-URL is ongeldig\n"
+msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "de gegeven ondertekeningbeleid URL is ongeldig\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "iets stiller zijn"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "de sleutels uit deze sleutelbos nemen"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "geeft alleen waarschuwing bij tijdsstempel conflicten"
 
-#: g10/armor.c:314
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr ""
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Gebruik: gpgv [opties] [bestanden] (-h voor hulp)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Syntaxis: gpg [opties] [bestanden]\n"
+"Ondertekeningen controleren met bekende, vertrouwde sleutels\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
-msgstr "beveiliging: %s\n"
+msgstr "bepantsering: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
-msgstr "ongeldige beveiliginsinformatie: "
+msgstr "ongeldige bepantseringskop: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
-msgstr "beveiligingsinformatie"
+msgstr "bepantseringskop: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
-msgstr "ongeldige informatie over leesbare ondertekening\n"
+msgstr "ongeldige kop niet-gecodeerde ondertekening\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
-msgstr "geneste leesbare ondertekeningen\n"
+msgstr "geneste niet-gecodeerde ondertekeningen\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
-msgstr "ongeldige regel met streepjes: "
+msgstr ""
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
-msgstr "onverwachte beveiliging:"
+msgstr "onverwachte bepantsering:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "ongeldig wortel64 teken %02x overgeslagen\n"
+msgstr "ongeldig grondtal64-teken %02x overgeslagen\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
-msgstr "voortijdig einde (geen controlesom)\n"
+msgstr "vroegtijdig einde bestand (geen CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
-msgstr "voortijdig einde (in controlesom)\n"
+msgstr "vroegtijdig einde bestand (in CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
-msgstr "verkeerde controlesom\n"
+msgstr "misvormde CRC\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
-msgstr "fout in controlesom; %06lx - %06lx\n"
+msgstr "CRC-fout; %06lx - %06lx\n"
 
-# fixme
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
-msgstr "voortijdig einde (in trailer)\n"
+msgstr "vroegtijdig einde bestand (in afsluitend deel)\n"
 
-# fixme
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
-msgstr "fout in de trailer regel\n"
+msgstr "fout in afsluitende regel\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
-msgstr "geen geldige OpenPGP gegevens gevonden.\n"
+msgstr "geen geldige OpenPGP-gegevens gevonden.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "ongeldige beveiliging: regel langer dan %d tekens\n"
+msgstr "ongeldige bepantsering: regel langer dan %d tekens\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"aangehaald gewoon teken in beveiliging - waaschijnlijk is er een foutief "
-"mailbezorgprogramma gebruikt\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
-msgstr ""
+msgstr "Geen reden opgegeven"
 
-#: g10/pkclist.c:63
-#, fuzzy
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
-msgstr "Sleutel is beveiligd.\n"
+msgstr "Sleutel is achterhaald"
 
-#: g10/pkclist.c:65
-#, fuzzy
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
-msgstr "Deze sleutel is niet beschikbaar"
+msgstr "Sleutel is in gevaar gebracht"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
-msgstr ""
+msgstr "Sleutel wordt niet meer gebruikt"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
-msgstr ""
+msgstr "Gebruikerscode is niet langer geldig"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
+msgstr "reden voor herroeping: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "[terugtrekking]"
+msgstr "herroepingsopmerking: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
-msgstr ""
+msgstr "iImMqQsS"
 
-#: g10/pkclist.c:258
-#, fuzzy, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
-"Geen vertrouwenswaarde toegekend aan %lu:\n"
+"Geen vertrouwenswaarde toegewezen aan:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:234
 #, fuzzy
+msgid "      aka \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
 "checking fingerprints from different sources...)?\n"
 "\n"
 msgstr ""
-"Geef aan hoezeer je deze gebruiker vertrouwt om de sleutels van andere\n"
-"gebruikers correct te verifieren (door naar paspoorten of\n"
-"vingerafdrukken van andere bronnen te kijken...) ?\n"
+"Besluit alstublieft in hoeverre u deze gebruiker erop\n"
+"vertrouwt om sleutels van andere gebruikers te\n"
+"controleren (door paspoorten te bekijken, vingerafdrukken\n"
+"te controleren van verschillende bronnen...).\n"
 "\n"
-" 1 = Geen idee\n"
-" 2 = Ik vertrouw hem niet\n"
-" 3 = Ik vertrouw hem maar ten dele\n"
-" 4 = Ik vertrouw hem volledig\n"
-" s = Geef wat meer informatie\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
-msgstr ""
-
-#: g10/pkclist.c:274
+#: g10/pkclist.c:250
 #, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = Weet niet\n"
+
+#: g10/pkclist.c:252
+#, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%08lx: We vertrouwen deze sleutel NIET\n"
+msgstr " %d = Ik vertrouw NIET\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr ""
+msgstr " %d = Ik vertrouw een beetje\n"
 
-#: g10/pkclist.c:276
-#, fuzzy, c-format
+#: g10/pkclist.c:256
+#, c-format
 msgid " %d = I trust fully\n"
-msgstr "%s: is geen vertrouwensdatabasebestand\n"
+msgstr " %d = Ik vertrouw volledig\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr ""
+msgstr " %d = Ik vertrouw maximaal\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
-msgstr ""
+msgstr " i = meer informatie weergeven\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
-msgstr " m = terug naar hoofdmenu\n"
+msgstr " m = terug naar het hoofdmenu\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
-msgstr ""
+msgstr " s = deze sleutel overslaan\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
-msgstr " q = be�indigen\n"
+msgstr " q = afsluiten\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
-msgstr "Uw keuze? "
+msgstr "Uw beslissing? "
 
-#: g10/pkclist.c:316
-#, fuzzy
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Wilt u deze sleutel echt verwijderen? "
+msgstr "Wilt u deze sleutel echt maximaal vertrouwen? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n"
+msgstr "Certificaten die leiden tot een maximaal vertrouwde sleutel:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
-msgstr "sleutel %08lx: sleutel is teruggeroepen!\n"
+msgstr "sleutel %08lX: sleutel is herroepen!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
-msgstr "Deze sleutel toch gebruiken? "
+msgstr "Toch deze sleutel gebruiken? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
-msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
+msgstr "sleutel %08lX: deelsleutel is herroepen!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
-msgstr "%08lx: sleutel is verlopen\n"
+msgstr "%08lX: sleutel is verlopen\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:430
 #, fuzzy, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"         Er is geen indicatie dat deze ondertekening van de eigenaar is.\n"
+"%08lX: Er is geen aanwijzing dat deze sleutel echt van de eigenaar is\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
-msgstr "%08lx: We vertrouwen deze sleutel NIET\n"
+msgstr "%08lX: We vertrouwen deze sleutel NIET\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lx: Het is niet helemaal zeker dat deze sleutel echt aan de\n"
-"eigenaar toebehoort, maar ik accepteer hem toch\n"
+"%08lX: Er is geen aanwijzing dat deze sleutel echt van de eigenaar is\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
-msgstr "Deze sleutel behoort waarschijnlijk toe aan de eigenaar\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "Deze sleutel is waarschijnlijk van de eigenaar\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Deze sleutel is van ons\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"Het is NIET zeker dat deze sleutel van de eigenaar is. Als je\n"
-"*echt* weet waar je mee bezig bent, mag je de volgende vraag\n"
-"beantwoorden met ja\n"
+"Het is NIET zeker dat deze sleutel echt van de persoon is die\n"
+"in de gebruikerscode staat.  Als u *echt* weet wat u doet, kunt\n"
+"u de volgende vraag met ja beantwoorden\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
-msgstr "LET OP: Ik gebruik een onbetrouwbare sleutel!\n"
+msgstr "WAARSCHUWING: Er wordt een niet-vertrouwde sleutel gebruikt!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"WAARSCHUWING: sleutel %08lX kan herroepen zijn: herroepingssleutel %08lX "
+"niet aanwezig.\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
+msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
-msgstr ""
-"         Dit zou kunnen betekenen dat de ondertekening een vervalsing is.\n"
+msgstr "         Dit kan betekenen dat de ondertekening een vervalsing is.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "LET OP: Deze subsleutel is ingetrokken door de eigenaar!\n"
+msgstr "WAARSCHUWING: Deze deelsleutel is herroepen door zijn eigenaar!\n"
 
-#: g10/pkclist.c:580
-#, fuzzy
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
-msgstr "Deze sleutel is niet beschikbaar"
+msgstr "Let op: Deze sleutel is uit gezet.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Let op: Deze sleutel is verlopen!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
-"LET OP: Deze sleutel is niet getekend met een betrouwbare ondertekening!\n"
+"WAARSCHUWING: Deze sleutel is niet gecertificeerd met een vertrouwde "
+"ondertekening!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
-"         Er is geen indicatie dat deze ondertekening van de eigenaar is.\n"
+"         Er is geen aanwijzing dat de ondertekening is van de eigenaar.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "LET OP: We vertrouwen NIET op deze sleutel!\n"
+msgstr "WAARSCHUWING: Vertrouw deze sleutel NIET!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "         De sleutel is waarschijnlijk VERVALST.\n"
+msgstr "         De ondertekening is waarschijnlijk VERVALST.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"LET OP: Deze sleutel is niet getekend met genoeg betrouwbare "
+"WAARSCHUWING: Deze sleutel is niet gecertificeerd met voldoende vertrouwde "
 "ondertekeningen!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr ""
-"        Het is niet zeker dat deze ondertekening toebehoort aan de "
-"eigenaar.\n"
+msgstr "         Het is niet zeker dat de ondertekening is van de eigenaar.\n"
 
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "u kunt %s niet gebruiken in %s modus\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: overgeslagen: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
+msgstr "%s: overgeslagen: openbare sleutel reeds aanwezig\n"
 
-#: g10/pkclist.c:811
-#, fuzzy
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr "U heeft geen gebruikerscode opgegeven. (u kunt \"-r\" gebruiken)\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
 msgstr ""
-"Je gaf geen gebruikersidentificatie op. (je kunt \"-r\" gebruiken)\n"
-"\n"
 
-#: g10/pkclist.c:824
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
+"\n"
+"Geef een gebruikerscode.  Eindig met een lege regel: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
-msgstr "Gebruiker bestaat niet.\n"
+msgstr "Gebruikerscode niet gevonden.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
-"overgeslagen: openbare sleutel is al ingesteld als de standaard ontvanger\n"
+"overgeslagen: openbare sleutel reeds ingesteld als standaard ontvanger\n"
 
-# fixme
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
-msgstr "Openbare sleutel is niet toegankelijk.\n"
+msgstr "Openbare sleutel is uit gezet.\n"
 
-#: g10/pkclist.c:870
-#, fuzzy
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
-msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
+msgstr "overgeslagen: openbare sleutel reeds ingesteld\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
-# fixme
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
+msgstr "%s: overgeslagen: openbare sleutel is uit gezet\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
-msgstr "geen geldige adressen\n"
+msgstr "geen geldige geadresseerden\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr ""
-
-#: g10/keygen.c:189
+#: g10/keygen.c:207
 #, fuzzy, c-format
-msgid "preference %c%lu duplicated\n"
-msgstr "`%s' overgeslagen: dubbel\n"
+msgid "preference `%s' duplicated\n"
+msgstr "voorkeur %c%lu komt dubbel voor\n"
 
-#: g10/keygen.c:194
-#, fuzzy, c-format
-msgid "too many `%c' preferences\n"
-msgstr "toon voorkeuren"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "teveel `%c' voorkeuren\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:216
 #, fuzzy
-msgid "invalid character in preference string\n"
-msgstr "Ongeldig teken in naam\n"
+msgid "too many digest preferences\n"
+msgstr "teveel `%c' voorkeuren\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "teveel `%c' voorkeuren\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "ongeldig teken in voorkeurtekenreeks\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "zelfondertekening wegschrijven\n"
+msgstr "bezig met schrijven directe ondertekening\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
-msgstr "zelfondertekening wegschrijven\n"
+msgstr "bezig met schrijven zelf-ondertekening\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
-msgstr "schrijven van sleutelbindingsondertekening\n"
+msgstr "bezig met schrijven sleutelbindende ondertekening\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
-#, fuzzy, c-format
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "Gevraagde sleutellengte is %u bits\n"
+msgstr "sleutelgrootte ongeldig; %u bits worden gebruikt\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
-#, fuzzy, c-format
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "afgerond naar %u bits\n"
+msgstr "sleutelgrootte naar boven afgerond tot %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
-msgstr "Selecteer aub wat voor sleutel u wilt:\n"
+msgstr "Kies alstublieft wat voor sleutel u wilt hebben:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (alleen versleutelen)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (alleen coderen)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:1171
 #, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
-
-#: g10/keygen.c:949
-#, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) DSA (alleen ondertekenen)\n"
+msgstr "   (%d) RSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:951
-#, fuzzy, c-format
+#: g10/keygen.c:1173
+#, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) ElGamal (alleen versleutelen)\n"
+msgstr "   (%d) RSA (alleen coderen)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
+msgstr "   (%d) RSA (ondertekenen en coderen)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
-msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr ""
-
-#: g10/keyedit.c:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1586,72 +1652,64 @@ msgid ""
 "              default keysize is 1024 bits\n"
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
-"Ik ga zo een nieuw %s sleutelpaar aanmaken.\n"
-"                 mimimale sleutellengte is  768 bits\n"
-"                standaard sleutellengte is 1024 bits\n"
-"     hoogste aan te raden sleutellengte is 2048 bits\n"
+"Er wordt een nieuw %s sleutelpaar aangemaakt.\n"
+"              minimale sleutelgrootte is  768 bits\n"
+"              standaard sleutelgrootte is 1024 bits\n"
+"    hoogst aangeraden sleutelgrootte is 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
-msgstr "Hoe lang wil je de sleutel maken? (1024) "
+msgstr "Welke sleutelgrootte wilt u? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
+msgstr "DSA staat alleen sleutelgroottes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:1027
-#, fuzzy
+#: g10/keygen.c:1241
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
+msgstr ""
+"sleutelgrootte te klein; 1024 is de kleinste toegestane waarde voor RSA.\n"
 
-#: g10/keygen.c:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
-
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+msgstr "sleutelgrootte te klein; 768 is de kleinste toegestane waarde.\n"
+
+#: g10/keygen.c:1255
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "sleutel te lang; %d is de maximumlengte.\n"
+msgstr "sleutelgrootte te groot; %d is de grootste toegestane waarde.\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
-"Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
-"lang duren!\n"
+"Sleutelgroottes boven de 2048 worden niet aangeraden\n"
+"omdat berekeningen daarmee ERG lang duren!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
-msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+msgstr "Weet u zeker dat u deze sleutelgrootte wilt? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
-"Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
-"erg vatbaar zijn voor aanvallen!\n"
+"Goed, maar houd er rekening mee dat de straling van uw beeldscherm en "
+"toetsenbord ook erg gevoelig zijn voor aanvallen!\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "Gevraagde sleutellengte is %u bits\n"
+msgstr "Gevraagde sleutelgrootte is %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
-msgstr "afgerond naar %u bits\n"
+msgstr "afgerond naar boven tot %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1660,15 +1718,14 @@ msgid ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"Geef aub aan hoe lang de sleutel geldig mag blijven.\n"
-"       0 = sleutel verloopt nooit\n"
-"    <n>  = sleutel verloopt over n dagen\n"
-"    <n>w = sleutel verloopt over n weken\n"
-"    <n>m = sleutel verloopt over n maanden\n"
-"    <n>y = sleutel verloopt over n jaar\n"
+"Geef alstublieft aan hoe lang de sleutel geldig moet zijn.\n"
+"         0 = sleutel verloopt niet\n"
+"      <n>  = sleutel verloopt na n dagen\n"
+"      <n>w = sleutel verloopt na n weken\n"
+"      <n>m = sleutel verloopt na n maanden\n"
+"      <n>y = sleutel verloopt na n jaren\n"
 
-#: g10/keygen.c:1126
-#, fuzzy
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1677,51 +1734,48 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"Geef aub aan hoe lang de sleutel geldig mag blijven.\n"
-"       0 = sleutel verloopt nooit\n"
-"    <n>  = sleutel verloopt over n dagen\n"
-"    <n>w = sleutel verloopt over n weken\n"
-"    <n>m = sleutel verloopt over n maanden\n"
-"    <n>y = sleutel verloopt over n jaar\n"
+"Geef alstublieft aan hoe lang de ondertekening geldig moet zijn.\n"
+"         0 = ondertekening verloopt niet\n"
+"      <n>  = ondertekening verloopt na n dagen\n"
+"      <n>w = ondertekening verloopt na n weken\n"
+"      <n>m = ondertekening verloopt na n maanden\n"
+"      <n>y = ondertekening verloopt na n jaren\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
-msgstr "Sleutel is geldig gedurende? (0) "
+msgstr "Hoe lang is de sleutel geldig? (0) "
 
-#: g10/keygen.c:1150
-#, fuzzy
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
-msgstr "Sleutel is geldig gedurende? (0) "
+msgstr "Hoe lang is de ondertekening geldig? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:1160
-#, fuzzy, c-format
+#: g10/keygen.c:1374
+#, c-format
 msgid "%s does not expire at all\n"
-msgstr "Sleutel verloopt nooit\n"
+msgstr "%s verloopt nooit\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
-#, fuzzy, c-format
+#: g10/keygen.c:1381
+#, c-format
 msgid "%s expires at %s\n"
-msgstr "Sleutel verloopt op %s\n"
+msgstr "%s verloopt op %s\n"
 
-# fixme
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
-"Uw systeem kan geen data weergeven van na 2038.\n"
-"Desondanks wordt het goed behandeld tot 2106.\n"
+"Uw systeem kan geen data weergeven na 2038.\n"
+"Het zal data echter correct verwerken tot 2106.\n"
 
-#: g10/keygen.c:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
-msgstr "Klopt dit (j/n)? "
+msgstr "Is dit juist (j/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1731,2449 +1785,2885 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"U heeft een gebruikersidentificatie nodig voor de sleutel; het\n"
-"programma bouwt deze op uit Echte naam, Kommentaar en Email Adres in\n"
-"dit formaat:\n"
-"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"U heeft een gebruikerscode nodig om de sleutel mee te identificeren;\n"
+"dit programma maakt een gebruikerscode van Echte naam, Opmerking\n"
+"en E-mail adres op de volgende manier:\n"
+"    \"Heinrich Heine (De dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
-msgstr "Naam mag niet beginnen met een cijfer\n"
+msgstr "Naam mag niet met een cijfer beginnen\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
-msgstr "Naam moet ten minste 5 tekens lang zijn\n"
+msgstr "Naam moet tenminste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
-msgstr "Email Adres: "
+msgstr "E-mail adres: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
-msgstr "Ongeldig email adres\n"
+msgstr "Geen geldig e-mail adres\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
-msgstr "Kommentaar: "
+msgstr "Opmerking: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
-msgstr "Ongeldig teken in kommentaar\n"
+msgstr "Ongeldig teken in opmerking\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "Je gebruik tekenverzameling `%s'.\n"
+msgstr "U gebruikt de `%s' tekenset.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"Je hebt deze gebruikersidentificatie gekozen:\n"
+"U heeft deze gebruikerscode gekozen:\n"
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
+"Stop het e-mail adres alstublieft niet in de echte naam of de opmerking\n"
 
-#: g10/keygen.c:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
-msgstr "NnKkEeOoEe"
+msgstr "NnOoEeAaFf"
 
-#: g10/keygen.c:1326
-#, fuzzy
+#: g10/keygen.c:1541
 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? "
+msgstr "(N)aam, (C) opmerking, (E)-mail wijzigen of (Q) afsluiten? "
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1542
 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? "
+msgstr ""
+"(N)aam, (C) opmerking, (E)-mail wijzigen of (O) accepteren/(Q) afsluiten? "
 
-#: g10/keygen.c:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
-msgstr ""
+msgstr "Verbeter de fout alstublieft eerst\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
+"U heeft een wachtwoord nodig om uw geheime sleutel mee te beschermen.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
-#, fuzzy
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
-msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
+msgstr "wachtwoord niet juist herhaald; probeer opnieuw"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
-msgstr ""
+msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"U heeft gekozen voor geen sleuteltekst - dit is waaschijnlijk een\n"
-"*slecht* idee! Ik zal het toch doen.  U kunt uw sleuteltekst altijd\n"
-"nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
+"U wilt geen wachtwoord - dit is waarschijnlijk een *slecht* idee!\n"
+"Toch zal ik het doen.  U kunt uw wachtwoord altijd veranderen,\n"
+"met dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"We hebben een heleboel willekeurige data nodig. Het is wellicht een\n"
-"goed idee om wat anders te doen (het toetsenbord en de muis gebruiken,\n"
-"of de schijven aanspreken) tijdens de generatie van de priemgetallen;\n"
-"dit geeft de generator een grotere kans om genoeg entropie te\n"
-"verzamelen.\n"
+"Voor het genereren hebben we veel willekeurige bytes nodig. Het is een\n"
+"goed idee om wat te doen (iets typen met het toetsenbord, de muis\n"
+"bewegen, schijven gebruiken) tijdens het genereren van priemgetallen;\n"
+"dit geeft de willekeurige getallen generator een betere kans om genoeg\n"
+"entropie te verzamelen.\n"
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "sorry, dat kan niet in batch-modus\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
+msgstr "DSA sleutelpaar zal 1024 bits hebben.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
-msgstr "Sleutelgeneratie afgebroken.\n"
+msgstr "Sleutelaanmaak geannuleerd.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
-#, fuzzy, c-format
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
 msgid "writing public key to `%s'\n"
-msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
+msgstr "bezig met schrijven openbare sleutel naar `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
 #, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
+msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
 
-#: g10/keygen.c:2205
-#, fuzzy, c-format
+#: g10/keygen.c:2565
+#, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
+msgstr "geen schrijfbare openbare sleutelbos gevonden: %s\n"
 
-#: g10/keygen.c:2211
-#, fuzzy, c-format
+#: g10/keygen.c:2571
+#, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
+msgstr "geen schrijfbare geheime sleutelbos gevonden: %s\n"
 
-#: g10/keygen.c:2225
-#, fuzzy, c-format
+#: g10/keygen.c:2589
+#, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+msgstr "fout bij schrijven openbare sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:2232
-#, fuzzy, c-format
+#: g10/keygen.c:2596
+#, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+msgstr "fout bij schrijven geheime sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
-msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
-
-#: g10/keygen.c:2253
-#, fuzzy
-msgid "key marked as ultimately trusted.\n"
-msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n"
+msgstr "openbare en geheime sleutel aangemaakt en ondertekend.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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 ""
-"Let er op dat deze sleutel niet gebruikt kan worden voor versleutelen.\n"
-"U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
-"sleutel te maken hiervoor.\n"
+"Let op dat deze sleutel niet gebruikt kan worden voor coderen.  Mogelijk\n"
+"wilt u daarvoor met de opdracht \"--edit-key\" een tweede sleutel aanmaken.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "Sleutelgeneratie is mislukt: %s\n"
+msgstr "Sleutelaanmaak mislukt: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
-"Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
+"sleutel is %lu seconde in de toekomst aangemaakt (tijdsreis of "
 "klokprobleem)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
-"sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
+"sleutel is %lu seconden in de toekomst aangemaakt (tijdsreis of "
 "klokprobleem)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
+"LET OP: het aanmaken van deelsleutels voor v3-sleutels komt niet overeen met "
+"OpenPGP\n"
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
-msgstr "Echt maken? "
+msgstr "Echt aanmaken? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
-msgstr ""
+msgstr "--uitvoer werkt niet voor deze opdracht\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
-msgstr "%s: kon niet openen: %s\n"
+msgstr "%s: kan niet openen: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "fout tijdens aanmake sleuteltekst: %s\n"
+msgstr "fout bij maken wachtwoord: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "kan geen symmetrisch ESK-pakket gebruiken vanwege de S2K-modus\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
 #, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "ondertekenen mislukt: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
 msgid "`%s' already compressed\n"
-msgstr "%lu sleutels verwerkt\n"
+msgstr "`%s' is al ingepakt\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
-msgstr "%s: LET OP: leeg bestand\n"
+msgstr "%s: WAARSCHUWING: leeg bestand\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
+"u kunt slechts coderen naar RSA-sleutels van 2048 bits of minder in --pgp2 "
+"modus\n"
 
-#: g10/encode.c:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
-msgstr "lezen uit `%s'\n"
+msgstr "bezig met lezen uit `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
+"kan de IDEA-codering niet gebruiken voor alle sleutels waarnaar u codeert.\n"
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"het afdwingen van symmetrische codering %s (%d) gaat tegen de voorkeuren van "
+"de ontvanger in\n"
 
-#: g10/encode.c:558 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:703
+#: g10/encode.c:634 g10/sign.c:863
 #, c-format
-msgid "you may not use %s while in %s mode\n"
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
+"het afdwingen van inpakalgoritme %s (%d) gaat tegen de voorkeuren van de "
+"ontvanger in\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s versleuteld voor: %s\n"
+msgstr "%s/%s gecodeerd voor: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
-#, fuzzy, c-format
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "gebruiker `%s' niet gevonden: %s\n"
+msgstr "sleutel `%s' niet gevonden: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
-#, fuzzy, c-format
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "fout bij lezen `%s': %s\n"
+msgstr "fout bij lezen sleutelblok: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "sleutel %08lX: niet beschermd - overgeslagen\n"
 
-#: g10/export.c:238
+#: g10/export.c:206
 #, fuzzy, c-format
-msgid "key %08lX: not protected - skipped\n"
-msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "sleutel %08lX: PGP 2.x stijl sleutel - overgeslagen\n"
 
-#: g10/export.c:246
+#: g10/export.c:353
 #, fuzzy, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+"WAARSCHUWING: geheime sleutel %08lX heeft geen eenvoudige SK controlesom\n"
 
-#: g10/export.c:347
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
-msgstr "LET OP: er is niets ge�xporteerd\n"
+msgstr "WAARSCHUWING: niets uitgevoerd\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
-msgstr "te veel ingangen in de pk cache - uitgezet\n"
+msgstr "teveel ingangen in pk buffer - uit gezet\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:2393
-#, fuzzy
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
-msgstr "[gebruiker niet gevonden]"
+msgstr "[Gebruikerscode niet gevonden]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
+"Ongeldige sleutel %08lX geldig gemaakt met --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, 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:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "geen geheime deelsleutel voor openbare deelsleutel %08lX - genegeerd\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr ""
+"de secundaire sleutel %08lX wordt gebruikt in plaats van primaire sleutel %"
+"08lX\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "blok van type %d wordt overgeslagen\n"
+msgstr "blok van soort %d wordt overgeslagen\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
-msgstr "%lu sleutels zijn tot nu toe behandeld\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "tot nu toe %lu sleutels verwerkt\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "Totaal aantal behandeld: %lu\n"
+msgstr "Totale aantal verwerkt: %lu\n"
 
-#: g10/import.c:286
-#, fuzzy, c-format
+#: g10/import.c:269
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "nieuwe subsleutels: %lu\n"
+msgstr "      overgeslagen nieuwe sleutels: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "          zonder identificatie: %lu\n"
+msgstr "          zonder gebruikerscode: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
-msgstr "ge�mporteerd: %lu"
+msgstr "              ingevoerd: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "onveranderd: %lu\n"
+msgstr "             ongewijzigd: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "nieuwe gebruikers: %lu\n"
+msgstr "          nieuwe gebruikerscodes: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "nieuwe subsleutels: %lu\n"
+msgstr "           nieuwe deelsleutels: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "nieuwe ondertekeningen: %lu\n"
+msgstr "        nieuwe ondertekeningen: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
+msgstr "   nieuwe sleutelherroepingen: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "geheime sleutels gelezen: %lu\n"
+msgstr "      gelezen geheime sleutels: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "geheime sleutels ge�mporteerd: %lu\n"
+msgstr "  ingevoerde geheime sleutels: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "onveranderde geheime sleutels: %lu\n"
+msgstr " ongewijzigde geheime sleutels: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "ge�mporteerd: %lu"
+msgstr "          niet ingevoerd: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
 
-#: g10/import.c:597
-#, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "U heeft deze gebruikerscodes ondertekend:\n"
 
-#: g10/import.c:612
-#, fuzzy, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
-"sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:619
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s ondertekeing, digest-algoritme %s\n"
+
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
-msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:621
-msgid "this may be caused by a missing self-signature\n"
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
-"dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
 
-#: g10/import.c:631 g10/import.c:903
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: public key not found: %s\n"
-msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "sleutel %08lX: gebruikerscode niet gevonden\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "sleutel %08lX: HKP-deelsleutel beschadiging gerepareerd\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr ""
+"sleutel %08lX: niet-zelfondertekende gebruikerscode '%s' geaccepteerd\n"
 
-#: g10/import.c:636
+#: g10/import.c:728
 #, fuzzy, c-format
-msgid "key %08lX: new key - skipped\n"
-msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+msgid "key %s: no valid user IDs\n"
+msgstr "sleutel %08lX: geen geldige gebruikerscodes\n"
 
-#: g10/import.c:646
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "dit is mogelijk veroorzaakt door een ontbrekende zelfondertekening\n"
+
+#: g10/import.c:740 g10/import.c:1151
 #, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "sleutel %08lX: nieuwe sleutel - overgeslagen\n"
+
+#: g10/import.c:755
+#, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+msgstr "geen schrijfbare sleutelbos gevonden: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "schrijven naar `%s'\n"
+msgstr "bezig met schrijven naar `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+msgstr "fout bij schrijven sleutelbos `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "sleutel %08lX: openbare sleutel ge�mporteerd\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "sleutel %08lX: openbare sleutel \"%s\" geïmporteerd\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
-msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "sleutel %08lX: komt niet overeen met onze versie\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, 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:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "sleutel %08lX: kan oorspronkelijk sleutelblok niet vinden: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, 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:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "sleutel %08lX: kan oorspronkelijk sleutelblok niet lezen: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "sleutel %08lX: \"%s\" 1 nieuwe gebruikerscode\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "sleutel %08lX: \"%s\" %d nieuwe gebruikerscodes\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "sleutel %08lX: \"%s\" 1 nieuwe ondertekening\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "sleutel %08lX: \"%s\" %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "sleutel %08lX: \"%s\" 1 nieuwe deelsleutel\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "sleutel %08lX: \"%s\" %d nieuwe deelsleutels\n"
 
-#: g10/import.c:774
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "sleutel %08lX: niet veranderd\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "sleutel %08lX: \"%s\" niet gewijzigd\n"
 
-#: g10/import.c:844
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "no default secret keyring: %s\n"
-msgstr "geen standaard openbare sleutelbos\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr ""
+"sleutel %08lX: geheime sleutel met ongeldige codering %d - overgeslagen\n"
 
-#: g10/import.c:855
+#: g10/import.c:1064
 #, c-format
-msgid "key %08lX: secret key imported\n"
-msgstr "sleutel %08lX: geheime sleutel ge�mporteerd\n"
+msgid "no default secret keyring: %s\n"
+msgstr "geen standaard geheime sleutelbos: %s\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
-msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "sleutel %08lX: geheime sleutel geïmporteerd\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "sleutel %08lX: al in geheime sleutelbos\n"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"sleutel %08lX: geen openbare sleutel - kan terugtrekkingscertificaat niet "
+"sleutel %08lX: geen openbare sleutel - kan herroepingscertificaat niet "
 "toepassen\n"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "sleutel %08lX: ongeldig herroepingscertificaat: %s - verworpen\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "sleutel %08lX: terugtrekkingscertificaat ge�mporteerd\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "sleutel %08lX: \"%s\" herroepingscertificaat geïmporteerd\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
-msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "sleutel %08lX: geen gebruikerscode voor ondertekening\n"
 
-#: g10/import.c:1030
+#: g10/import.c:1299
 #, fuzzy, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr ""
+"sleutel %08lX: niet-ondersteund openbare sleutel algoritme bij "
+"gebruikerscode \"%s\"\n"
 
-#: g10/import.c:1032
+#: g10/import.c:1301
 #, fuzzy, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "sleutel %08lX: ongeldige zelfondertekening bij gebruikerscode \"%s\"\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
-msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "sleutel %08lX: geen deelsleutel voor sleutelkoppeling\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
-msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "sleutel %08lX: niet-ondersteund openbare sleutel algoritme\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "sleutel %08lX: ongeldige deelsleutelkoppeling\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "sleutel %08lX: meervoudige deelsleutelkoppeling verwijderd\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "sleutel %08lX: geen deelsleutel voor sleutelherroeping\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "sleutel %08lX.%lu: Geldige subsleutelterugtrekking\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "sleutel %08lX: ongeldige deelsleutel herroeping\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "sleutel %08lX: meervoudige deelsleutel herroeping verwijderd\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
-msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "sleutel %08lX: gebruikerscode overgeslagen '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
-msgstr "sleutel %08lX: subsleutel overgeslagen\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "sleutel %08lX: deelsleutel overgeslagen\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr ""
-"sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - "
-"overgeslagen\n"
+"sleutel %08lX: niet-uitvoerbare ondertekening (klasse %02x) - overgeslagen\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
-"sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
-"overgeslagen\n"
+"sleutel %08lX: herroepingscertificaat op verkeerde plek - overgeslagen\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "sleutel %08lX: ongeldig herroepingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
-"sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
-"overgeslagen\n"
+"sleutel %08lX: deelsleutel ondertekening op verkeerde plek - overgeslagen\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
-"sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
+"sleutel %08lX: onverwachte ondertekeningsklasse (0x%02X) - overgeslagen\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "sleutel %08lX: dubbele gebruikerscode gevonden - samengevoegd\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
+"WAARSCHUWING: sleutel %08lX kan herroepen zijn: herroepingssleutel %08lX "
+"wordt opgehaald\n"
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
+"WAARSCHUWING: sleutel %08lX kan herroepen zijn: herroepingssleutel %08lX "
+"niet aanwezig.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "sleutel %08lX: \"%s\" herroepingscertificaat toegevoegd\n"
 
-#: g10/import.c:1491
+#: g10/import.c:1804
 #, fuzzy, c-format
-msgid "key %08lX: direct key signature added\n"
-msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
+msgid "key %s: direct key signature added\n"
+msgstr "sleutel %08lX: directe sleutelondertekening toegevoegd\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
-msgstr "[terugtrekking]"
+msgstr "[herroeping]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
-msgstr "1 ongeldige ondertekening\n"
+msgstr "1 slechte ondertekening\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "%d ongeldige ondertekeningen\n"
+msgstr "%d slechte ondertekeningen\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
-msgstr "1 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\n"
+msgstr "1 ondertekening niet gecontroleerd vanwege een ontbrekende sleutel\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
-msgstr "%d ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\n"
+msgstr "%d ondertekeningen niet gecontroleerd vanwege ontbrekende sleutels\n"
 
-#: g10/keyedit.c:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
-msgstr "1 ondertekening niet gecontroleerd wegens een fout\n"
+msgstr "1 ondertekening niet gecontroleerd vanwege een fout\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "%d ondertekeningen niet gecontroleerd wegens fouten\n"
+msgstr "%d ondertekeningen niet gecontroleerd vanwege fouten\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "1 gebruikersidentificatie gevonden zonder geldige zelfondertekening\n"
+msgstr "1 gebruikerscode zonder geldige zelfondertekening gevonden\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr ""
-"%d gebruikersidentificaties gevonden zonder geldige zelfondertekening\n"
+msgstr "%d gebruikerscodes zonder geldige zelfondertekening gevonden\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
 #, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Ik vertrouw een beetje\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Ik vertrouw volledig\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "Sleutel is beveiligd.\n"
+msgstr "Gebruikerscode \"%s\" is herroepen."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
-#, fuzzy
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+msgstr "Weet u zeker dat u deze toch wilt ondertekenen? (j/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
-msgstr ""
+msgstr "  Kan niet ondertekenen.\n"
+
+#: g10/keyedit.c:519
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Gebruikerscode \"%s\" is herroepen."
 
-#: g10/keyedit.c:380
+#: g10/keyedit.c:545
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "LET OP: `%s' is een leeg bestand\n"
+msgid "User ID \"%s\" is not self-signed."
+msgstr "WAARSCHUWING: gebruikerscode \"%s\" is niet zelfondertekend.\n"
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
+"De zelfondertekening op \"%s\"\n"
+"is een PGP 2.x-stijl ondertekening.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Wilt u deze promoveren tot een OpenPGP zelfondertekening? (j/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Uw huidige ondertekening van \"%s\"\n"
+"is verlopen.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
+"Wilt u een nieuwe ondertekening plaatsen om de oude te vervangen? (j/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
+"Uw huidige ondertekening van \"%s\"\n"
+"is een lokale ondertekening.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
+"WIlt u deze promoveren tot een volledig uitvoerbare ondertekening? (j/N) "
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:657
 #, fuzzy, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "Reeds ondertekend met sleutel %08lx\n"
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" was al lokaal ondertekend met sleutel %08lX\n"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:660
 #, fuzzy, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "Reeds ondertekend met sleutel %08lx\n"
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" was al ondertekend met sleutel %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
-msgstr "Niets te tekenen met sleutel %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Wilt u deze toch ondertekenen? (j/N) "
 
-#: g10/keyedit.c:478
-#, fuzzy
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Niets te ondertekenen bij sleutel %08lX\n"
+
+#: g10/keyedit.c:702
 msgid "This key has expired!"
-msgstr "Let op: Deze sleutel is verlopen!\n"
+msgstr "Deze sleutel is verlopen!"
 
-#: g10/keyedit.c:498
-#, fuzzy, c-format
+#: g10/keyedit.c:722
+#, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Deze sleutel is niet beveiligd.\n"
+msgstr "Deze sleutel zal verlopen op %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr ""
+msgstr "Wilt u dat uw ondertekening op hetzelfde moment verloopt? (J/n) "
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
+"U kunt geen OpenPGP-ondertekening maken van een PGP 2.x sleutel in --pgp2 "
+"modus.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr ""
+msgstr "Dit zou de sleutel onbruikbaar maken in PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 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 ""
+"Hoe nauwkeurig heeft u gecontroleerd dat de sleutel die u nu ondertekent "
+"echt\n"
+"is van de bovengenoemde persoon?  Als u geen antwoord weet, kies \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr ""
+msgstr "   (0) Ik geef geen antwoord.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr ""
+msgstr "   (1) Ik heb helemaal niet gecontroleerd.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr ""
+msgstr "   (2) Ik heb nonchalant gecontroleerd.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) Ik heb heel nauwkeurig gecontroleerd.%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
-"Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
+"Weet u zeker dat u deze sleutel wilt ondertekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr ""
-"dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
+"\n"
+"Dit zal een zelfondertekening zijn.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
-"Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
+"WAARSCHUWING: de ondertekening zal niet worden gemarkeerd als niet-"
+"uitvoerbaar.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
-"Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
+"WAARSCHUWING: de ondertekening zal niet worden gemarkeerd als niet-"
+"herroepbaar.\n"
 
-#: g10/keyedit.c:620
-#, fuzzy
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
-"Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
+"De ondertekening zal worden gemarkeerd als niet-uitvoerbaar.\n"
 
-#: g10/keyedit.c:624
-#, fuzzy
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
-"Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
+"De ondertekening zal worden gemarkeerd als niet-herroepbaar.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
+"\n"
+"Ik heb deze sleutel helemaal niet gecontroleerd.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
+"\n"
+"Ik heb deze sleutel nonchalant gecontroleerd.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
+"\n"
+"Ik heb deze sleutel heel nauwkeurig gecontroleerd.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
-msgstr "Echt tekenen? "
+msgstr "Echt ondertekenen? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "ondertekening mislukt: %s\n"
+msgstr "ondertekenen mislukt: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
-msgstr "Deze sleutel is niet beveiligd.\n"
+msgstr "Deze sleutel is niet beschermd.\n"
 
-#: g10/keyedit.c:748
-#, fuzzy
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
-msgstr "geheime sleutel niet beschikbaar"
+msgstr "Geheime delen van primaire sleutel zijn niet beschikbaar.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
-msgstr "Sleutel is beveiligd.\n"
+msgstr "Sleutel is beschermd.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Geef de sleuteltekst voor deze geheime sleutel.\n"
+"Geef het nieuwe wachtwoord voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
+"U wilt geen wachtwoord - dit is waarschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
-msgstr "Wilt u dit echt? "
+msgstr "Wilt u dit echt doen? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
-msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
+msgstr "een sleutelondertekening wordt naar de juiste plek verplaatst\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
-msgstr "be�indig dit menu"
+msgstr "dit menu verlaten"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
-msgstr "bewaar"
+msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
-msgstr "opslaan en be�indigen"
+msgstr "opslaan en afsluiten"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
-msgstr "hulp"
+msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
-msgstr "geef deze hulp"
+msgstr "deze hulp weergeven"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
-msgstr "toon vingerafdruk"
+msgstr "vingerafdruk weergeven"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
-msgstr "lijst"
+msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
-msgstr "lijst van sleutel- en gebruikersidentificaties"
+msgstr "sleutel en gebruikerscodes opsommen"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
-msgstr "gebruikersidentificatie"
+msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
-msgstr "selecteer gebruikersidentificatie N"
+msgstr "gebruikerscode N selecteren"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
-msgstr "sleutel"
+msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
-msgstr "selecteer subsleutel N"
+msgstr "secundaire sleutel N kiezen"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
-msgstr "controleer"
+msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
-msgstr "toon ondertekeningen"
+msgstr "ondertekeningen opsommen"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
-msgstr "onderteken"
+msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
-msgstr "onderteken de sleutel"
+msgstr "de sleutel ondertekenen"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "een losse ondertekening maken"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
-msgstr "lteken"
+msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
-msgstr "teken de sleutel lokaal"
+msgstr "de sleutel lokaal ondertekenen"
 
-#: g10/keyedit.c:916
-#, fuzzy
+#: g10/keyedit.c:1154
 msgid "nrsign"
-msgstr "onderteken"
+msgstr "nrsign"
 
-#: g10/keyedit.c:916
-#, fuzzy
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
-msgstr "teken de sleutel lokaal"
+msgstr "de sleutel niet-herroepbaar ondertekenen"
 
-#: g10/keyedit.c:917
-#, fuzzy
+#: g10/keyedit.c:1155
 msgid "nrlsign"
-msgstr "onderteken"
+msgstr "nrlsign"
 
-#: g10/keyedit.c:917
-#, fuzzy
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
-msgstr "teken de sleutel lokaal"
+msgstr "de sleutel lokaal en niet-herroepbaar ondertekenen"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
-msgstr "voeg een gebruikersidentificatie toe"
+msgstr "een gebruikerscode toevoegen"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
-msgstr ""
+msgstr "addphoto"
 
-#: g10/keyedit.c:920
-#, fuzzy
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
-msgstr "voeg een gebruikersidentificatie toe"
+msgstr "een foto ID toevoegen"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
-msgstr "verwijder gebruikersidentificatie"
+msgstr "gebruikerscode verwijderen"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
-msgstr ""
+msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
-msgstr "voeg een secundaire sleutel toe"
+msgstr "een secundaire sleutel toevoegen"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
-msgstr "verwijder een secundaire sleutel"
+msgstr "een secundaire sleutel verwijderen"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "revkey"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "voeg een secundaire sleutel toe"
+msgstr "een herroepingssleutel toevoegen"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
-msgstr "verwijder ondertekeningen"
+msgstr "ondertekeningen verwijderen"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
-msgstr "verander de vervaldatum"
+msgstr "de verloopdatum wijzigen"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
-msgstr ""
+msgstr "primary"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
-msgstr ""
+msgstr "gebruikerscode als primair markeren"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
-msgstr "wissel"
+msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
-msgstr "wissel tussen geheime en openbare sleutels"
+msgstr "overschakelen tussen geheime en openbare sleutellijst"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
-#, fuzzy
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
-msgstr "toon voorkeuren"
+msgstr "lijst voorkeuren (ervaren gebruiker)"
 
-#: g10/keyedit.c:934
-#, fuzzy
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
-#, fuzzy
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
-msgstr "toon voorkeuren"
+msgstr "lijst voorkeuren (breedsprakig)"
 
-#: g10/keyedit.c:935
-#, fuzzy
+#: g10/keyedit.c:1173
 msgid "setpref"
-msgstr "pref"
+msgstr "setpref"
 
-#: g10/keyedit.c:935
-#, fuzzy
+#: g10/keyedit.c:1173
 msgid "set preference list"
-msgstr "toon voorkeuren"
+msgstr "voorkeurenlijst instellen"
 
-#: g10/keyedit.c:936
-#, fuzzy
+#: g10/keyedit.c:1174
 msgid "updpref"
-msgstr "pref"
+msgstr "updpref"
 
-#: g10/keyedit.c:936
-#, fuzzy
+#: g10/keyedit.c:1174
 msgid "updated preferences"
-msgstr "toon voorkeuren"
+msgstr "voorkeuren bijgewerkt"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "sleutelserverfout"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "kon sleutelserver URI niet inlezen\n"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
-msgstr "verander de sleuteltekst"
+msgstr "het wachtwoord wijzigen"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
-msgstr "verander het vertrouwen in de eigenaar"
+msgstr "het eigenaarsvertrouwen wijzigen"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
-msgstr "roep ondertekeningen terug"
+msgstr "ondertekeningen herroepen"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "een gebruikerscode herroepen"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
-msgstr "trek secundaire sleutel in"
+msgstr "een secundaire sleutel herroepen"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
-msgstr "sta het gebruik van een sleutel niet toe"
+msgstr "een sleutel uit zetten"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
-msgstr "sta gebruik van een sleutel toe"
+msgstr "een sleutel aan zetten"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
-msgstr ""
+msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
-msgstr ""
+msgstr "foto ID weergeven"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
-msgstr "kan dat niet doen in lopende band-modus\n"
+msgstr "dat kan niet in batch-modus\n"
 
-#: g10/keyedit.c:1000
-#, fuzzy, c-format
+#: g10/keyedit.c:1233
+#, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "fout bij lezen `%s': %s\n"
+msgstr "fout bij lezen geheim sleutelblok `%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
-msgstr "Commando> "
+msgstr "Opdracht> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
-msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
+msgstr "De geheime sleutel is nodig om dit te doen.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
-msgstr ""
+msgstr "Gebruik alstublieft eerst de \"toggle\" opdracht.\n"
 
-#: g10/keyedit.c:1134
-#, fuzzy
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
-msgstr "Sleutel is beveiligd.\n"
+msgstr "Sleutel is herroepen."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
-msgstr "Echt alle gebruikers tekenen? "
+msgstr "Echt alle gebruikerscodes ondertekenen? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
+msgstr "Tip: Selecteer de gebruikerscodes om te ondertekenen\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr ""
+msgstr "Deze opdracht is niet toegestaan in %s modus.\n"
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
-msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
+msgstr "U dient tenminste één gebruikerscode te selecteren.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
-msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
+msgstr "U kunt niet de laatste gebruikerscode verwijderen!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
-msgstr "Al deze gebruikers echt verwijderen? "
+msgstr "Echt alle geselecteerde gebruikerscodes verwijderen? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
-msgstr "Deze gebruiker echt verwijderen? "
+msgstr "Echt deze gebruikerscode verwijderen? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
-msgstr "U moet op zijn minst een sleutel selecteren.\n"
+msgstr "U dient tenminste één sleutel te selecteren.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
-msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
+msgstr "Wilt u echt de geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
-msgstr "Wilt u deze sleutel echt verwijderen? "
+msgstr "Wilt u echt deze sleutel verwijderen? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Echt alle geselecteerde gebruikerscodes herroepen? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Echt deze gebruikerscode herroepen? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
-msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
+msgstr "Wilt u echt de geselecteerde sleutels herroepen? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
-msgstr "Wilt u deze sleutel echt intrekken? "
+msgstr "Wilt u echt deze sleutel herroepen? "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1606
 #, fuzzy
+msgid "Set preference list to:\n"
+msgstr "voorkeurenlijst instellen"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Al deze gebruikers echt verwijderen? "
+msgstr "Echt de voorkeuren bijwerken voor de geselecteerde gebruikerscodes? "
 
-#: g10/keyedit.c:1356
-#, fuzzy
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
-msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
+msgstr "Echt de voorkeuren bijwerken? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
-msgstr "Veranderingen bewaren? "
+msgstr "Wijzigingen opslaan? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
-msgstr "Be�indigen zonder te bewaren? "
+msgstr "Afsluiten zonder op te slaan? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
-msgstr "bijwerken ging niet: %s\n"
+msgstr "bijwerken mislukt: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
+msgstr "bijwerken geheim mislukt: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
-msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
+msgstr "Sleutel niet gewijzigd dus bijwerken niet nodig.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Foutief commando (probeer \"help\")\n"
+msgstr "Ongeldige opdracht (probeer \"hulp\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
-msgid "This key may be revoked by %s key "
-msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Samenvatting: "
 
-#: g10/keyedit.c:1754
-msgid " (sensitive)"
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Mogelijkheden: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
 msgstr ""
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
+#: g10/keyedit.c:2063
 #, c-format
-msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgid "This key may be revoked by %s key "
+msgstr "Deze sleutel is mogelijk herroepen door sleutel %s "
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr " (gevoelig)"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "kan %s niet aanmaken: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[herroepen] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [verloopt: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [verloopt: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " vertrouwen: %c/%c"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:2107
 #, c-format
-msgid " trust: %c/%c"
+msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
-msgstr "Deze sleutel is niet beschikbaar"
+msgstr "Deze sleutel is uit gezet"
 
-#: g10/keyedit.c:1802
-#, fuzzy, c-format
+#: g10/keyedit.c:2146
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! subsleutel is teruggeroepen: %s\n"
+msgstr "herroepen! deelsleutel is herroepen: %s\n"
 
-#: g10/keyedit.c:1805
-#, fuzzy
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
-msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
+msgstr "herroepen- vervalste herroeping gevonden\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "herroepen? probleem bij controleren herroeping: %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[herroepen] "
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+msgstr "Er zijn geen voorkeuren op een PGP 2.x stijl gebruikerscode.\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
+"Let er alstublieft op dat de weergegeven sleutelgeldigheid niet per sé "
+"juist\n"
+"is tenzij u het programma opnieuw start.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[herroepen] "
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[verlopen] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2399
 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 ""
+"WAARSCHUWING: Dit is een PGP2-stijl sleutel.  Het toevoegen van een foto ID "
+"kan\n"
+"         zorgen dat sommige versies van PGP deze sleutel verwerpen.\n"
 
-#: g10/keyedit.c:2006
-#, fuzzy
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
-msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+msgstr "Weet u zeker dat u deze toch wilt toevoegen? (j/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr ""
+msgstr "U kunt geen foto ID toevoegen aan een PGP2 stijl sleutel.\n"
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
-msgstr "Verwijder deze goede ondertekening? (j/N/q)"
+msgstr "Deze goede ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
+msgstr "Deze ongeldige ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
+msgstr "Deze onbekende ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
-msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
+msgstr "Echt deze zelfondertekening verwijderen? (j/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"WAARSCHUWING: Dit is een PGP 2.x-stijl sleutel.  Een aangestelde herroeper\n"
+"         toevoegen kan zorgen dat sommige versies van PGP deze sleutel "
+"verwerpen.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+"U kunt geen aangestelde herroeper toevoegen aan een PGP 2.x stijl sleutel.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Geef de sleutelgrootte"
+msgstr "Geef de gebruikerscode van de aangestelde herroeper: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
+"kan een PGP 2.x stijl sleutel niet aanwijzen als een aangestelde herroeper\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "u kunt geen sleutel aanwijzen als zijn eigen aangestelde herroeper\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
+"WAARSCHUWING: het aanwijzen van een sleutel als een aangestelde herroeper "
+"kan niet ongedaan gemaakt worden!\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Wilt u echt deze sleutel aanwijzen als een aangestelde herroeper? (j/N): "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
-msgstr "Haal a.u.b. de selecties weg voor de geheime sleutels.\n"
+msgstr "Verwijder alstublieft selecties van de geheime sleutels.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
-msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
+msgstr "Selecteer alstublieft ten hoogste één secundaire sleutel.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
-msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
+msgstr "De verlooptijd voor een secundaire sleutel wordt gewijzigd.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
-msgstr "Vervaldatum voor primaire sleutel instellen.\n"
+msgstr "De verlooptijd voor de primaire sleutel wordt gewijzigd.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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"
+msgstr "U kunt de verlooptijd van een v3-sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
-msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
+msgstr "Geen geassocieerde ondertekening in geheime sleutelbos\n"
 
-#: g10/keyedit.c:2546
-#, fuzzy
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
-msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
+msgstr "Selecteer alstublieft precies één gebruikerscode.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
+msgstr "v3-zelfondertekening op gebruikerscode \"%s\" wordt overgeslagen\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "Geen gebruikersidentificatie met index %d\n"
+msgstr "Geen gebruikerscode met index %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
-msgstr "gebruikersidentificatie: \""
+msgstr "gebruikerscode: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
-"tekende met uw sleutel %08lX op %s\n"
+"ondertekend met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2918
+#: g10/keyedit.c:3499
 #, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
-"tekende met uw sleutel %08lX op %s\n"
+"lokaal ondertekend met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2923
-#, fuzzy, c-format
+#: g10/keyedit.c:3504
+#, c-format
 msgid "This signature expired on %s.\n"
-msgstr "Deze sleutel is niet beveiligd.\n"
+msgstr "Deze ondertekening is verlopen op %s.\n"
 
-#: g10/keyedit.c:2927
-#, fuzzy
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+msgstr "Weet u zeker dat u deze nog steeds wilt herroepen? (j/N) "
 
-#: g10/keyedit.c:2931
-#, fuzzy
+#: g10/keyedit.c:3512
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)"
+msgstr "Een herroepingscertificaat maken voor deze ondertekening? (j/N) "
 
-#. FIXME: detect duplicates here
-#: g10/keyedit.c:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
-msgstr "U heeft deze gebruikers ondertekend:\n"
+msgstr "U heeft deze gebruikerscodes ondertekend:\n"
 
-#: g10/keyedit.c:2975
+#: g10/keyedit.c:3558
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s%s\n"
-msgstr "   getekend door %08lX op %s\n"
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   ondertekend door %08lX op %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
-msgstr "   ingetrokken door %08lX op %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   herroepen door %08lX op %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
-msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n"
+msgstr "U staat op het punt deze ondertekeningen te herroepen:\n"
 
-#: g10/keyedit.c:3013
+#: g10/keyedit.c:3597
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
-msgstr "   getekend door %08lX op %s\n"
+msgid "   signed by %s on %s%s\n"
+msgstr "   ondertekend door %08lX op %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
-msgstr ""
+msgstr " (niet-uitvoerbaar)"
 
-#: g10/keyedit.c:3022
-#, fuzzy
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
+msgstr "Echt de herroepingscertificaten maken? (j/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "gebruikerscode \"%s\" is al herroepen\n"
+
+#: g10/keyedit.c:3723
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
+"WAARSCHUWING: een gebruikerscode ondertekening is van %d seconden in de "
+"toekomst\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr ""
+"Foto ID %s van grootte %ld voor sleutel 0x%08lX (gebruiker %d) wordt "
+"weergegeven\n"
+
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "%s ondertekening van: %s\n"
+msgstr "Kritisch ondertekenbeleid: "
 
-#: g10/keylist.c:93
-#, fuzzy
+#: g10/keylist.c:181
 msgid "Signature policy: "
-msgstr "%s ondertekening van: %s\n"
+msgstr "Ondertekenbeleid: "
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
-msgstr "LET OP: ongeldige aantekeningen gevonden\n"
+msgstr "WAARSCHUWING: ongeldige notatiegegevens gevonden\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Aantekening: "
+msgstr "Kritische ondertekennotatie: "
 
-#: g10/keylist.c:129
-#, fuzzy
+#: g10/keylist.c:288
 msgid "Signature notation: "
-msgstr "Aantekening: "
+msgstr "Ondertekennotatie: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
-msgstr ""
+msgstr "niet leesbaar voor mensen"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
-msgstr ""
+msgstr "Sleutelbos"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
 #, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [verloopt: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
 msgid " [expires: %s]"
-msgstr "Sleutel verloopt op %s\n"
+msgstr " [verloopt: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[herroepen] "
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "sleutels en vingerafdrukken opnoemen"
+msgstr "Vingerafdruk primaire sleutel:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "            Vingerafdruk:"
+msgstr "     Vingerafdruk deelsleutel:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "            Vingerafdruk:"
+msgstr " Vingerafdruk primaire sleutel:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "            Vingerafdruk:"
+msgstr "      Vingerafdruk deelsleutel:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
+#: g10/keylist.c:1372 g10/keylist.c:1376
 #, fuzzy
-msgid "     Key fingerprint ="
-msgstr "            Vingerafdruk:"
+msgid "      Key fingerprint ="
+msgstr "     Vingerafdruk sleutel ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "vreemde grootte voor een gecodeerde sessiesleutel (%d)\n"
 
-#: g10/mainproc.c:258
+#: g10/mainproc.c:262
 #, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "ongeldig frommelalgoritme `%s'\n"
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "onbekend codeeralgoritme"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "vreemde grootte voor een gecodeerde sessiesleutel (%d)\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
-msgstr "%s versleutelde gegevens\n"
+msgstr "%s gecodeerde gegevens\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "versleuteld met onbekend algoritme %d\n"
+msgstr "gecodeerd met onbekend algoritme %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "gecodeerd met onbekend algoritme %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
+msgstr "openbare sleutel gecodeerde gegevens: goede DEK\n"
 
-#: g10/mainproc.c:415
-#, 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:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "gecodeerd met %u-bit %s sleutel, ID %08lX, aangemaakt op %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
-msgstr "versleuteld met %s sleutel, nummer %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "gecodeerd met %s sleutel, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
+msgstr "openbare sleutel decodering mislukt: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
 #, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "Herhaal wachtwoord\n"
+
+#: g10/mainproc.c:502
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "Herhaal wachtwoord\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "%s versleutelde gegevens\n"
+msgstr "er wordt aangenomen dat het om %s-gecodeerde gegevens gaat\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
+"IDEA-codering niet beschikbaar; er wordt optimistisch in plaats daarvan %s "
+"te gebruiken\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
-msgstr "ontsleutelen ging goed\n"
+msgstr "decodering goed\n"
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WAARSCHUWING: bericht integriteit was niet beschermd\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "LET OP: het versleutelde bericht is veranderd!\n"
+msgstr "WAARSCHUWING: het gecodeerde bericht is gemanipuleerd!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "ontsleuteling mislukte: %s\n"
+msgstr "decodering mislukt: %s\n"
 
-# Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
+msgstr "LET OP: verzender heeft gevraagd om \"alleen-voor-uw-ogen\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
-msgstr "originele bestandsnaam='%.*s'\n"
+msgstr "oorspronkelijke bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
-
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Aantekening: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Beleid: "
+msgstr "losstaande herroeping - gebruik \"gpg --import\" om toe te passen\n"
 
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
-msgstr "controle van de ondertekening overgeslagen\n"
+msgstr "verificatie van ondertekening onderdrukt\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
-#, fuzzy
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
-msgstr "maak een losstaande ondertekening"
+msgstr "kan deze meervoudige ondertekeningen niet verwerken\n"
 
-#: g10/mainproc.c:1310
-#, 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:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Ondertekening verlopen %s\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
-msgid "BAD signature from \""
-msgstr "FOUTE ondertekening van \""
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                alias \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Ondertekening gemaakt op %.*s met %s sleutel ID %08lX\n"
+
+#: g10/mainproc.c:1370
 #, fuzzy
+msgid "Key available at: "
+msgstr "Geen hulp beschikbaar"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr "SLECHTE ondertekening van \""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
-msgstr "Correcte ondertekening van \""
+msgstr "Verlopen ondertekening van \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
-msgstr "Correcte ondertekening van \""
+msgstr "Goede ondertekening van \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
-msgstr ""
+msgstr "[onzeker]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
-msgstr "              alias \""
+msgstr "                alias \""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Ondertekening verlopen %s\n"
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Ondertekening verloopt %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s ondertekeing, digest-algoritme %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binair"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "tekstmodus"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "onbekend"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
-#, fuzzy
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
-msgstr "maak een losstaande ondertekening"
+msgstr "geen losgekoppelde ondertekening\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"WAARSCHUWING: meerdere ondertekeningen gevonden.  Alleen de eerste wordt "
+"gecontroleerd.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "losstaande ondertekening van type 0x%02x\n"
+msgstr "losstaande ondertekening van klasse 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
+msgstr "ongeldig root-pakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "kan geheugendumps niet uitzetten: %s\n"
+msgstr "kan geheugendumps niet uit zetten: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
-msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
+msgstr "Experimentele algoritme moeten niet worden gebruikt!\n"
 
-#: g10/misc.c:192
-#, fuzzy
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
+msgstr ""
+"dit coderingsalgoritme wordt afgeraden; gebruik alstublieft een wat "
+"normalere!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
-msgstr ""
+msgstr "de IDEA-coderingsplug-in is niet aanwezig\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
+"zie alstublieft http://www.gnupg.org/why-not-idea.html voor meer informatie\n"
 
-#: g10/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "LET OP: `%s' is een leeg bestand\n"
+msgstr "%s:%d: afgeraden optie \"%s\"\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "LET OP: `%s' is een leeg bestand\n"
+msgstr "WAARSCHUWING: \"%s\" is een afgeraden optie\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr ""
+msgstr "gebruik alstublieft \"%s%s\"\n"
+
+#: g10/misc.c:508
+#, fuzzy
+msgid "Uncompressed"
+msgstr "niet verwerkt"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "niet verwerkt"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "dit bericht is mogelijk niet bruikbaar voor %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "bezig met lezen opties uit `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "onbekende standaard ontvanger `%s'\n"
 
 #: 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"
+msgstr "kan openbare sleutel algoritme %d niet behandelen\n"
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
 
-#: g10/parse-packet.c:1065
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "subpakket type %d heeft kritische bit gezet\n"
+msgstr "deelpakket van soort %d heeft kritische bit ingesteld\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
-msgstr ""
+msgstr "gpg-agent is niet beschikbaar in deze sessie\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
-msgstr ""
+msgstr "kan PID voor agent niet instellen\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr ""
+msgstr "misvormde GPG_AGENT_INFO omgevingsvariabele\n"
 
-#: g10/passphrase.c:511
-#, fuzzy, c-format
+#: g10/passphrase.c:530
+#, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
+msgstr "gpg-agent protocol versie %d wordt niet ondersteund\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "kan geen verbinding maken met `%s': %s\n"
+msgstr "kan niet verbinden met `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "communicatieprobleem met gpg-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
-msgstr ""
+msgstr "probleem met de agent - gebruik van agent uit gezet\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
-msgstr " (hoofdsleutelnummer %08lX)"
+msgstr " (hoofdsleutel ID %08lX)"
 
-#: g10/passphrase.c:641
-#, fuzzy, c-format
+#: g10/passphrase.c:691
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
-"\n"
-"U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
-"sleutel op te heffen voor gebruiker \"%.*s\"\n"
+"U heeft een wachtwoord nodig om de geheime sleutel te ontgrendelen voor "
+"gebruiker:\n"
+"\"%.*s\"\n"
 "%u-bit %s sleutel, ID %08lX, gemaakt op %s%s\n"
 
-#: g10/passphrase.c:662
-#, fuzzy
-msgid "Enter passphrase\n"
-msgstr "Geef de sleuteltekst: "
-
-#: g10/passphrase.c:664
-#, fuzzy
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
-msgstr "Herhaal de sleuteltekst: "
+msgstr "Herhaal wachtwoord\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Geef wachtwoord\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
-msgstr ""
+msgstr "wachtwoord te lang\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
-msgstr ""
+msgstr "ongeldig antwoord van agent\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
-msgstr ""
+msgstr "geannuleerd door gebruiker\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr ""
+msgstr "probleem met agent: agent geeft 0x%lx terug\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "kan niet vragen om wachtwoord in batch-modus\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Geef wachtwoord: "
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 "\n"
-"U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
-"sleutel voor gebruiker op te heffen: \""
+"U heeft een wachtwoord nodig om de geheime sleutel\n"
+"voor de gebruiker te ontgrendelen: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s sleutel, ID %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "kan niet om wachtwoord vragen in lopende band-modus\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Geef de sleuteltekst: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (hoofdsleutel ID %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
-msgstr "Herhaal de sleuteltekst: "
+msgstr "Herhaal wachtwoord: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
-"gegevens niet bewaard; gebruik de optie \"--output\" om het op te slaan in\n"
+"gegevens niet opgeslagen; gebruik optie \"--output\" om gegevens op te "
+"slaan\n"
 
-#: g10/plaintext.c:108
-#, fuzzy, c-format
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
 msgid "error creating `%s': %s\n"
-msgstr "fout bij lezen `%s': %s\n"
+msgstr "fout bij maken `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
-msgstr "Losstaande ondertekening.\n"
+msgstr "Losgekoppelde ondertekening.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
-msgstr "Geef de naam van het gegevensbestand: "
+msgstr "Geef bestandsnaam van gegevensbestand: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
-msgstr "lezen uit standaard invoer ...\n"
+msgstr "bezig met lezen standaard invoer...\n"
 
-#: g10/plaintext.c:396
-#, fuzzy
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "geen ondertekende gegevens\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
 
-#: g10/pubkey-enc.c:101
+#: g10/pubkey-enc.c:103
 #, fuzzy, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "anonieme ontvanger; ik probeer geheime sleutel %08lX ...\n"
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonieme ontvanger; geheime sleutel %08lX wordt geprobeerd...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "okee, wij zijn de anonieme ontvanger.\n"
+msgstr "goed, we zijn de anonieme ontvanger.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
-msgstr "oude codering van de DEK wordt niet ondersteund.\n"
+msgstr "oude codering van DEK wordt niet ondersteund\n"
 
-#: 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:221
+#: g10/pubkey-enc.c:228
 #, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "coderingsalgoritme %d%s is onbekend of uit gezet\n"
 
-#: g10/pubkey-enc.c:243
+#: g10/pubkey-enc.c:266
 #, 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"
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "LET OP: coderingsalgoritme %d niet gevonden in voorkeuren\n"
 
-#: g10/hkp.c:71
+#: g10/pubkey-enc.c:286
 #, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "opvragen van sleutel %08lX van %s ...\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "kan de sleutel niet opvragen van de server: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "fout bij versturen naar `%s': %s\n"
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "LET OP: geheime sleutel %08lX verlopen op %s\n"
 
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "versturen naar `%s' gelukt (status=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "fout bij versturen naar `%s': status=%u\n"
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "LET OP: sleutel is herroepen"
 
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr "delen geheime sleutel zijn niet beschikbaar\n"
 
-#: g10/hkp.c:515
+#: g10/seckey-cert.c:60
 #, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
-
-#: g10/hkp.c:565
-#, fuzzy, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "kan de sleutel niet opvragen van de server: %s\n"
-
-#: g10/seckey-cert.c:53
-#, fuzzy
-msgid "secret key parts are not available\n"
-msgstr "geheime sleutel niet beschikbaar"
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "beschermingsalgoritme %d%s wordt niet ondersteund\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:71
 #, fuzzy, c-format
-msgid "protection algorithm %d%s is not supported\n"
-msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
+msgid "protection digest %d is not supported\n"
+msgstr "beschermingsalgoritme %d%s wordt niet ondersteund\n"
 
-#: g10/seckey-cert.c:224
-#, fuzzy
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
-msgstr "Foutieve sleuteltekst; probeer a.u.b. opnieuw ...\n"
+msgstr "Ongeldig wachtwoord; probeer alstublieft opnieuw"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
-msgstr ""
+msgstr "%s...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
-"LET OP: Kwetsbare sleutel gevonden - verander a.u.b. de sleuteltekst "
+"WAARSCHUWING: Zwakke sleutel gevonden - wijzig alstublieft het wachtwoord "
 "opnieuw.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
+"er wordt een afgeraden 16-bit controlesom gegenereerd om te geheime sleutel "
+"te beschermen\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
+msgstr "WAARSCHUWING: ondertekening en digest conflicteren in bericht\n"
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:102
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"dit is een ElGamal sleutel van PGP, die NIET veilig is voor "
-"ondertekeningen!\n"
+"WAARSCHUWING: het aanwijzen van een sleutel als een aangestelde herroeper "
+"kan niet ongedaan gemaakt worden!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "openbare sleutel is %lu seconde nieuwer dan de ondertekening\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "openbare sleutel %08lX is %lu seconde nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "openbare sleutel %08lX is %lu seconden nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
-"Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
+"sleutel is %lu seconde in de toekomst aangemaakt (tijdsreis of "
 "klokprobleem)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
-"sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
+"sleutel is %lu seconden in de toekomst aangemaakt (tijdsreis of "
 "klokprobleem)\n"
 
-#: g10/sig-check.c:249
+#: g10/sig-check.c:192
 #, fuzzy, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "LET OP: sleutel voor ondertekening %08lX is vervallen op %s\n"
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "LET OP: ondertekening van sleutel %08lX verlopen op %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"er wordt aangenomen dat de ondertekening van sleutel %08lX slecht is, "
+"vanwege een onbekende kritische bit\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "sleutel %08lX: geen deelsleutel voor deelsleutel-herroepingspakket\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "sleutel %08lX: geen deelsleutel voor sleutelkoppeling\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"kan geen notatiegegevens in v3 (PGP 2.x stijl) ondertekeningen stoppen\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+"kan geen notatiegegevens in v3 (PGP 2.x stijl) sleutelondertekeningen "
+"stoppen\n"
+
+#: g10/sign.c:112
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
+"WAARSCHUWING: kan notatie niet %%-uitbreiden  (te groot).  Niet uitgebreide "
+"versie wordt gebruikt.\n"
 
-#: g10/sign.c:151
-#, c-format
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "kan geen beleid-URL in v3 (PGP 2.x stijl) ondertekeningen stoppen\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "kan geen beleid-URL in v3 (PGP 2.x stijl) ondertekeningen stoppen\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
+"WAARSCHUWING: kan beleid-URL niet %%-uitbreiden (te groot).  Niet "
+"uitgebreide versie wordt gebruikt.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:187
 #, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"WAARSCHUWING: kan beleid-URL niet %%-uitbreiden (te groot).  Niet "
+"uitgebreide versie wordt gebruikt.\n"
+
+#: g10/sign.c:364
+#, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "Kan ondertekening niet controleren: %s\n"
+msgstr "het controleren van de aangemaakte ondertekening is mislukt: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "%s ondertekening van: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s ondertekening van: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "LET OP: `%s' is een leeg bestand\n"
+msgstr "WAARSCHUWING: `%s' is een leeg bestand\n"
 
-#: g10/sign.c:644
+#: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"u kunt alleen losgekoppeld ondertekenen met PGP 2.x stijl sleutels in in --"
+"pgp2 modus\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
+msgstr ""
+"afdwingen van digest-algoritme %s (%d) overtreedt voorkeuren ontvanger\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
-msgstr "ondertekenen:"
+msgstr "bezig met ondertekenen:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"u kunt alleen niet-gecodeerde ondertekeningen maken met PGP 2.x stijl "
+"sleutels in --pgp2 modus\n"
 
-#: g10/sign.c:1029
-#, fuzzy, c-format
+#: g10/sign.c:1138
+#, c-format
 msgid "%s encryption will be used\n"
-msgstr "ontsleuteling mislukte: %s\n"
+msgstr "%s codering zal worden gebruikt\n"
 
 #: g10/textfilter.c:134
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "kan tekstregels langer dan %d tekens niet aan\n"
+msgstr "kan tekstregels langer dan %d tekens niet verwerken\n"
 
 #: g10/textfilter.c:231
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "invoerregel langer dan %d tekens\n"
 
-# Untranslated.
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "trustdb rec %lu: lseed failed: %s\n"
+msgstr "trustdb rec %lu: lseek mislukt: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: schrijven mislukt (n=%d): %s\n"
 
 #: g10/tdbio.c:244
 msgid "trustdb transaction too large\n"
-msgstr "transactie naar vertrouwensdatabase te groot\n"
+msgstr "trustdb transactie te groot\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
-msgstr "%s: kan er niet bij: %s\n"
+msgstr "%s: kan niet benaderen: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: map bestaat niet!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s: kan hem niet vergrendelen\n"
+msgstr "%s: kan geen blokkering aanmaken\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
-#, fuzzy, c-format
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
 msgid "%s: can't make lock\n"
-msgstr "%s: kan hem niet vergrendelen\n"
+msgstr "%s: kan geen blokkering maken\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
-msgstr "%s: kan hem niet aanmaken: %s\n"
+msgstr "%s: kan niet aanmaken: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: aanmaken van versieveld lukte niet: %s"
+msgstr "%s: aanmaken versie-ingang mislukt: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: foutieve vertrouwensdatabase aangemaakt\n"
+msgstr "%s: ongeldige trustdb aangemaakt\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: vertrouwensdatabase aangemaakt\n"
+msgstr "%s: trustdb aangemaakt\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "LET OP: trustdb niet schrijfbaar\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: ongeldige vertrouwensdatabase\n"
+msgstr "%s: ongeldige trustdb\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: kon frommeltabel niet aanmaken: %s\n"
+msgstr "%s: aanmaken hash-tabel mislukt: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: fout bij het bijwerken van versieveld: %s\n"
+msgstr "%s: fout bij bijwerken versie-ingang: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: fout bij het lezen van het versieveld: %s\n"
+msgstr "%s: fout bij lezen versie-ingang: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: fout bij het schrijven van het versieveld: %s\n"
+msgstr "%s: fout bij schrijven versie-ingang: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "vertrouwensdatabase: lseek mislukte: %s\n"
+msgstr "trustdb: lseek mislukt: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "vertrouwensdatabase: lezen mislukte (n=%d): %s\n"
+msgstr "trustdb: lezen mislukt (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: is geen vertrouwensdatabasebestand\n"
+msgstr "%s: geen trustdb bestand\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s: versieveld met recnr %lu\n"
+msgstr "%s: versie-ingang met recnum %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ongeldige bestandsversie %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: fout bij het lezen van een beschikbaar veld: %s\n"
+msgstr "%s: fout bij lezen vrije ingang: %s\n"
 
-# dir?
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: fout bij het schrijven van indexveld: %s\n"
+msgstr "%s: fout bij schrijven map ingang: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: veld met nullen vullen lukte niet: %s\n"
+msgstr "%s: op nul stellen van een ingang mislukt: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s: kon geen veld toevoegen: %s\n"
+msgstr "%s: achtervoegen van een ingang mislukt: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"de vertrouwensdatabase is beschadigd; draai a.u.b. \"gpg --fix-trustdb\".\n"
+"de trustdb is beschadigd; voer alstublieft \"gpg --fix-trustdb\" uit.\n"
 
-#: g10/trustdb.c:200
-#, fuzzy, c-format
+#: g10/trustdb.c:226
+#, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "%s: ongeldig sleutelnummer\n"
+msgstr "`%s' is geen geldige lange keyID\n"
+
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "sleutel %08lX: geaccepteerd als vertrouwde sleutel\n"
 
-#: g10/trustdb.c:235
+#: g10/trustdb.c:295
 #, fuzzy, c-format
-msgid "key %08lX: accepted as trusted key\n"
-msgstr "sleutel %08lX: geaccepteerd als een betrouwbare sleutel.\n"
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "sleutel %08lX komt meerdere keren voor in de trustdb\n"
 
-#: g10/trustdb.c:274
+#: g10/trustdb.c:310
 #, fuzzy, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "sleutel %08lX: kan niet toevoegen aan de vertrouwensdatabase\n"
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr ""
+"sleutel %08lX: geen openbare sleutel voor vertrouwde sleutel - overgeslagen\n"
 
-#: g10/trustdb.c:290
+#: g10/trustdb.c:320
 #, fuzzy, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+msgid "key %s marked as ultimately trusted\n"
+msgstr "sleutel gemarkeerd als maximaal vertrouwd.\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "vertrouwensveld %lu, req type %d: lezen mislukte: %s\n"
+msgstr "vertrouwensingang %lu, req soort %d: lezen mislukt: %s\n"
 
-#: g10/trustdb.c:338
-#, fuzzy, c-format
+#: g10/trustdb.c:350
+#, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "vertrouwensveld %lu: verwijderen mislukte: %s\n"
+msgstr "vertrouwensingang %lu is niet van gevraagde soort %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "vertrouwensveld %lu, type %d: schrijven mislukte: %s\n"
+msgstr "vertrouwensingang %lu, soort %d: schrijven mislukt: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "vertrouwensdatabase: synchronisatie mislukte: %s\n"
+msgstr "trustdb: synchronisatie mislukt: %s\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
 #, fuzzy
+msgid "never"
+msgstr "nooit"
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
-msgstr "%s: is geen vertrouwensdatabasebestand\n"
+msgstr "trustdb controle niet nodig\n"
 
-# Untranslated.
-#: g10/trustdb.c:474 g10/trustdb.c:1641
-#, fuzzy, c-format
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "trustdb rec %lu: lseed failed: %s\n"
+msgstr "volgende trustdb controle op %s\n"
 
-#: g10/trustdb.c:779
-#, fuzzy
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "trustdb controle niet nodig\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "trustdb controle niet nodig\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "openbare sleutel %08lX niet gevonden: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "doe alstublieft een --check-trustdb\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
-msgstr "verander het vertrouwen in de eigenaar"
+msgstr "bezig met controleren trustdb\n"
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d sleutels verwerkt (%d geldigheidsgetallen gewist)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "geen maximaal vertrouwde sleutels gevonden\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1925
 #, fuzzy, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "publieke sleutel niet gevonden"
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "openbare sleutel van maximaal vertrouwde sleutel %08lX niet gevonden\n"
 
-#: g10/trustdb.c:1515
+#: g10/trustdb.c:1948
 #, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "vertrouwensingang %lu, soort %d: schrijven mislukt: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"deze ondertekening kon niet worden gecontroleerd.\n"
-"Onthoud dat het bestand met de ondertekening (.sig of .asc) het eerste\n"
-"bestand van de commandoregel moet zijn.\n"
+"de ondertekening kon niet worden geverifieerd.\n"
+"Onthoud alstublieft dat het ondertekeningsbestand (.sig of .asc)\n"
+"als eerste moet worden gegevens op de opdrachtregel.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "invoerregel %u is te lang, of ontbrekende LF\n"
+msgstr "invoerregel %u te lang of mist LF (enter)\n"
 
 #: 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-"
+"sleutel is niet gemarkeerd als onveilig - kan deze niet gebruiken met de nep "
 "RNG!\n"
 
 #: g10/skclist.c:157
-#, fuzzy, c-format
+#, c-format
 msgid "skipped `%s': duplicated\n"
 msgstr "`%s' overgeslagen: dubbel\n"
 
@@ -4183,24 +4673,22 @@ msgid "skipped `%s': %s\n"
 msgstr "`%s' overgeslagen: %s\n"
 
 #: g10/skclist.c:168
-#, fuzzy
 msgid "skipped: secret key already present\n"
-msgstr "overgeslagen: geheime sleutel is al aanwezig\n"
+msgstr "overgeslagen: geheime sleutel reeds aanwezig\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"`%s' overgeslagen: dit is een ElGamal sleutel gemaakt door PGP, dit is\n"
-"niet veilig genoeg voor ondertekeningen!\n"
+"`%s' overgeslagen: dit is een met PGP aangemaakte ElGamal-sleutel die niet "
+"veilig is voor ondertekeningen!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "Bestand `%s' bestaat al. "
+msgstr "Bestand `%s' bestaat. "
 
 #: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
@@ -4213,28 +4701,34 @@ msgstr "%s: onbekend achtervoegsel\n"
 
 #: g10/openfile.c:141
 msgid "Enter new filename"
-msgstr "Geef een nieuwe bestandsnaam"
+msgstr "Geef nieuwe bestandsnaam"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
-msgstr "naar standaard uitvoer schrijven\n"
+msgstr "bezig met schrijven naar standaard uitvoer\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "ik neem aan dat de getekende gegevens zich in `%s' bevinden\n"
+msgstr "er wordt aangenomen dat het in `%s' om ondertekende gegevens gaat\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: nieuw optiebestand aangemaakt\n"
+msgstr "nieuw configuratiebestand `%s' aangemaakt\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"WAARSCHUWING: opties in `%s' zijn tijdens deze sessie nog niet actief\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
-msgstr "%s: kan map niet aamaken: %s\n"
+msgstr "%s: kan map niet aanmaken: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: map aangemaakt\n"
@@ -4243,189 +4737,163 @@ msgstr "%s: map aangemaakt\n"
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"LET OP: dit bericht werd versleuteld met een zwakke sleutel in het\n"
-"symmetrische versleutelalgoritme.\n"
+"WAARSCHUWING: bericht was gecodeerd met een zwakke sleutel in de "
+"symmetrische codering.\n"
 
 #: g10/encr-data.c:98
-#, fuzzy
 msgid "problem handling encrypted packet\n"
-msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
+msgstr "probleem bij verwerken gecodeerd pakket\n"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
-msgstr "zwakke sleutel gemaakt - ik probeer het opnieuw\n"
+msgstr "zwakke sleutel aangemaakt - bezig met opnieuw proberen\n"
 
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"kon het aanmaken van een zwakke sleutel voor het symmetrische\n"
-"algoritme niet voorkomen; ik heb het %d keer geprobeerd!\n"
+"kan zwakke sleutel voor symmetrische codering niet vermijden; %d keer "
+"geprobeerd!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
+msgstr "DSA vereist het gebruik van een 160-bits hash-algoritme\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(tenzij u de sleutel aangeeft met de vingerafdruk)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "kan dat niet doen in lopende band-mode zonder \"--yes\"\n"
+msgstr "dat kan niet in batch-modus zonder \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
-msgstr "Deze sleutel van de sleutelbos verwijderen? "
+msgstr "Deze sleutel verwijderen uit de sleutelbos? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "Dit is een geheime sleutel! - echt verwijderen? "
 
-#: g10/delkey.c:168
-#, fuzzy, c-format
+#: g10/delkey.c:157
+#, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "nummeren van de sleutelblokken mislukte: %s\n"
+msgstr "verwijderen sleutelblok mislukt: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
-msgstr ""
+msgstr "eigenaarsvertrouwen informatie gewist\n"
 
-#: g10/delkey.c:206
-#, fuzzy, c-format
+#: g10/delkey.c:195
+#, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "er is een geheime sleutel voor deze openbare sleutel!\n"
+msgstr "er is een geheime sleutel voor openbare sleutel \"%s\"!\n"
 
-#: g10/delkey.c:208
-#, fuzzy
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
-"gebruik eerst de optie \"--delete-secret-key\" om hem te verwijderen.\n"
+"gebruik de optie \"--delete-secret-keys\" om deze eerst te verwijderen.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"Het is aan u om hier een waarde te geven; deze waarde zal nooit\n"
-"weggegeven worden aan derden.  We hebben het nodig om het\n"
-"netwerk-van-vertrouwen op te bouwen; het heeft niets te maken met het\n"
-"netwerk-van-certificaten (dat automatisch gemaakt wordt)."
+"Het is aan u om hier een waarde toe te wijzen; deze waarde wordt nooit\n"
+"uitgevoerd naar een derde partij.  We hebben het nodig om een web\n"
+"van vertrouwen te maken; het heeft niets te maken met het (impliciet\n"
+"gemaakte) web van certificaten."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
+"Om een Web van Vertrouwen te bouwen, moet GnuPG weten welke\n"
+"sleutels maximaal vertrouwd moeten worden - dit zijn meestal de\n"
+"sleutels waarvan u toegang heeft tot de geheime sleutel.  Antwoord\n"
+"\"ja\" om deze sleutel in te stellen als maximaal vertrouwd\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
-msgstr "Als u dit desondanks toch wilt intrekken, antwoord dan \"ja\"."
+msgstr "Antwoord \"ja\" als u toch deze herroepen sleutel wilt gebruiken."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
-"Als u deze onbetrouwbare sleutel toch wilt gebruiken, antwoord dan \"ja\"."
+"Antwoord \"ja\" als u toch deze niet-vertrouwde sleutel wilt gebruiken."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Geef de identificatie van de ontvangende gebruiker."
+msgstr ""
+"Geef de gebruikerscode van de geadresseerde aan wie u het bericht wilt "
+"sturen."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Selecteer het te gebruiken algoritme.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (ook wel DSS) is het `Digital Signature Algoritm' dat alleen\n"
-"gebruikt kan worden voor ondertekeningen.  Dit heeft de voorkeur omdat\n"
-"controle van DSA ondertekeningen veel sneller gaan dan van ElGamal.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal is een algoritme dat gebruikt kan worden voor ondertekening en\n"
-"versleuteling.  OpenPGP maakt een onderscheid tussen de twee varianten\n"
-"van dit algoritme: alleen versleutelen en versleutelen+tekenen; het is\n"
-"in werkelijkheid het zelfde, maar sommige parameters moeten speciaal\n"
-"gezet worden voor de aanmaak van een veilige sleutel voor\n"
-"ondertekeningen: dit programma doet dit, maar andere OpenPGP\n"
-"implementaties zijn niet verplicht om de versleutelen+tekenen-variant\n"
-"te ondersteunen.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"De eerste (primaire) sleutel moet altijd een sleutel zijn waarmee\n"
-"ondertekend kan worden; om deze reden is de ElGamal sleutel voor\n"
-"alleen versleutelen niet aanwezig in dit menu."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Hoewel deze sleutels gedefinieerd zijn in RFC2440, worden ze niet\n"
-"aangeraden om dat ze niet ondersteund worden door alle programma's, en\n"
-"ondertekeningen die ermee gemaakt zijn, zijn behoorlijk groot en traag\n"
-"te verifi�ren."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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 ""
+"In het algemeen is het geen goed idee om dezelfde sleutel te gebruiken\n"
+"voor ondertekenen en coderen.  Dit algoritme moet alleen in bepaalde\n"
+"domeinen worden gebruikt.\n"
+"Neem alstublieft eerst contact op met uw veiligheidsexpert."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
-msgstr "Geef de sleutelgrootte"
+msgstr "Geef de grootte van de sleutel"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
-msgstr "Antwoord met \"ja\" of \"nee\""
+msgstr "Beantwoord \"ja\" of \"nee\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"Geef de verwachtte waarde zoals aangegeven in de prompt.\n"
-"Het is mogelijk om een ISO datum (JJJJ-MM-DD) op te geven, maar u zult\n"
-"dan geen goede foutafhandeling krijgen, inplaats daarvan zal het\n"
-"systeem deze waarde proberen te interpreteren als een interval."
+"Geef de vereiste waarde zoals weergegeven in de opdrachtregel.\n"
+"Het is mogelijk om een ISO-datum (JJJJ-MM-DD) in te geven, maar\n"
+"u zal geen goede foutrespons krijgen - in plaats daarvan zal het\n"
+"systeem de gegeven waarde proberen te interpreteren als een\n"
+"interval."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
-msgstr "Geef de naam van de eigenaar van de sleutel"
+msgstr "Geef de naam van de sleutelhouder"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
-msgstr "geef a.u.b. een optioneel maar aan te raden e-mail adres."
+msgstr ""
+"geef alstublieft een niet-verplichte maar sterk aangeraden e-mail adres"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
-msgstr "Geef eventueel een kanttekening"
+msgstr "Geef alstublieft een niet-verplichte opmerking"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4433,17 +4901,18 @@ msgid ""
 "O  to continue with key generation.\n"
 "Q  to to quit the key generation."
 msgstr ""
-"N  om de naam te veranderen.\n"
-"C  om het kommentaar te veranderen.\n"
-"E  om het e-mail adres te veranderen.\n"
-"O  om door te gaan met de sleutelgeneratie.\n"
-"Q  om te stoppen met de sleutelgeneratie."
+"N  om de naam te wijzigen.\n"
+"C  om de opmerking te wijzigen.\n"
+"E  om het e-mail adres te wijzigen.\n"
+"O  om door te gaan met de aanmaak van de sleutel.\n"
+"Q  om te stoppen met de aanmaak van de sleutel."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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."
+msgstr ""
+"Beantwoord \"ja\" (of \"j\") als het goed is om een deelsleutel aan te maken."
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 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"
@@ -4483,56 +4952,94 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
+"Als u een gebruikerscode op een sleutel ondertekend, is het eerst nodig\n"
+"dat u controleert dat de sleutel is van de persoon die genoemd wordt in\n"
+"de gebruikerscode.  Het is nuttig voor anderen om precies te weten hoe\n"
+"nauwkeurig u dit gedaan heeft.\n"
+"\n"
+"\"0\" betekent dat u niets beweert over u precies u de sleutel geverifieerd\n"
+"....heeft.\n"
+"\n"
+"\"1\" betekent dat u gelooft dat de sleutel is van de persoon die beweert "
+"de\n"
+"    eigenaar te zijn, maar dat u de sleutel helemaal niet geverifieerd "
+"heeft\n"
+"    Dit is nuttig voor een \"persona\" verificatie, waar u de sleutel van "
+"een\n"
+"    pseudonieme gebruiker ondertekent.\n"
+"\n"
+"\"2\" betekent dat u de sleutel een beetje geverifieerd heeft.  "
+"Bijvoorbeeld\n"
+"    door de vingerafdruk van de sleutel te controleren en de gebruikerscode\n"
+"    t.o.v. een foto ID te vergelijken.\n"
+"\n"
+"\"3\" betekent dat u een uitgebreide verificatie van de sleutel heeft "
+"gedaan.\n"
+"    Bijvoorbeeld door de vingerafdruk van de sleutel in persoon te "
+"verifiëren\n"
+"    met de eigenaar van de sleutel, door de naam van de sleutel eigenaar\n"
+"    vast te stellen aan de hand van een betrouwbaar document met foto\n"
+"    (zoals een paspoort), en door met het versturen van e-mail te "
+"controleren\n"
+"    dat het e-mail adres van de sleutel eigenaar is.\n"
+"\n"
+"Let op dat de voorbeelden bij niveau 2 en 3 *alleen* voorbeelden zijn.\n"
+"Het is uiteindelijk aan u om te besluiten wat \"een beetje\" en \"uitgebreid"
+"\"\n"
+"voor u betekent bij het ondertekenen van sleutels.\n"
+"\n"
+"Als u niet weet wat te antwoorden, kunt u \"0\" antwoorden."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
-msgstr "Antwoord met \"ja\" als u ALLE gebruikersidentificaties wilt tekenen"
+msgstr "Antwoord \"ja\" als u ALLE gebruikerscodes wilt ondertekenen"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
-"Antwoord \"ja\" indien u deze gebruiker echt wilt verwijderen.\n"
-"Alle certificaten gaan dan ook verloren!"
+"Antwoord \"ja\" als u echt deze gebruikerscode wilt verwijderen.\n"
+"Alle certificaten zullen ook verloren gaan!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Antwoord met \"ja\" als het goed is om de subsleutel te verwijderen"
+msgstr "Antwoord \"ja\" als het goed is om de deelsleutel te verwijderen"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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 ""
-"Dit is een geldige ondertekening van de sleutel; u hoeft deze normaal\n"
-"gesproken niet te verwijderen, omdat het misschien een vertrouwens-\n"
-"relatie met deze of een andere sleutel verstoort, die getekend is met\n"
-"deze sleutel."
+"Dit is een geldige ondertekening op de sleutel; normaal\n"
+"gesproken wilt u deze ondertekening niet verwijderen omdat\n"
+"deze belangrijk kan zijn in het tot stand brengen van een\n"
+"vertrouwensverbinding met de sleutel of een andere sleutel\n"
+"die gecertificeerd wordt met deze sleutel."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"Deze ondertekening kan niet gecontroleerd worden omdat u de\n"
-"bijbehorende sleutel niet heeft.  U kunt het verwijderen beter\n"
-"uitstellen totdat u weet welke sleutel gebruikt was, omdat het\n"
-"ondertekenen met deze sleutel misschien een vertrouwensband kan\n"
-"scheppen met een andere, al getekende, sleutel."
+"De ondertekening kan niet worden gecontroleerd omdat u de\n"
+"geassocieerde sleutel niet heeft.  U kunt beter wachten met de\n"
+"verwijdering totdat u weet welke sleutel gebruikt is, omdat deze\n"
+"ondertekensleutel mogelijk een vetrouwensverbinding tot stand\n"
+"brengt via een andere gecertificeerde sleutel."
 
-#: g10/helptext.c:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
 msgstr ""
-"De ondertekening is ongeldig.  Het is zinnig om deze uit de sleutelbos\n"
-"te verwijderen."
+"De ondertekening is niet geldig.  Het is logisch deze te verwijderen\n"
+"uit uw sleutelbos."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4540,49 +5047,50 @@ msgid ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"Dit is een ondertekening die de gebruikersidentificatie met de sleutel\n"
-"verbindt. Het is meestal geen goed idee om zo'n ondertekening te\n"
-"verwijderen. Wellicht is GnuPG zelfs niet meer in staat om de sleutel\n"
-"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."
+"Dit is een ondertekening die de gebruikerscode aan de sleutel bindt.\n"
+"Het is meestal geen goed idee om zo'n ondertekening te verwijderen.\n"
+"GnuPG kan zelfs niet meer in staat zijn om deze sleutel te gebruiken.\n"
+"Doe dit dus alleen als deze zelfondertekening om de een of andere\n"
+"reden niet geldig is en er een tweede beschikbaar is."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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 ""
+"De voorkeuren van alle gebruikerscodes (of alleen bepaalde) veranderen\n"
+"naar de huidige lijst van voorkeuren.  De tijdsstempel van alle betrokken\n"
+"zelfondertekeningen worden verhoogt met een seconde.\n"
 
-#: g10/helptext.c:244
-#, fuzzy
+#: g10/helptext.c:233
 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, ..."
+msgstr "Geef alstublieft het wachtwoord; dit is een geheime zin \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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."
+"Herhaal alstublieft het laatste wachtwoord, zodat u zeker weet wat u heeft "
+"ingevoerd."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
-msgstr "Geef de naam van het bestand waaraan de ondertekening toebehoort"
+msgstr ""
+"Geef de naam van het bestand waarvoor de ondertekening van toepassing is"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 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:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"Geef a.u.b. een nieuwe bestansnaam. Als u op RETURN drukt, wordt de\n"
-"standaard bestandsnaam (tussen blokhaken weergegeven) gebruikt."
+"Geef alstublieft een nieuwe bestandsnaam. Als u alleen op enter\n"
+"drukt wordt het (weergegeven) standaardbestand gebruikt."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4597,421 +5105,656 @@ msgid ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
-
-#: g10/helptext.c:286
+"Het is nodig om een reden voor de certificatie op te geven.  Afhankelijk "
+"van\n"
+"van context kunt u uit de volgende lijst kiezen:\n"
+"  \"Sleutel is in gevaar gebracht\"\n"
+"      Gebruik dit als u een reden heeft om te geloven dat personen toegang\n"
+"      tot uw geheime sleutel hebben gekregen die dat niet mochten hebben.\n"
+"  \"Sleutel is achterhaald\"\n"
+"      Gebruik dit als u deze sleutel heeft vervangen door een nieuwere.\n"
+"  \"Sleutel wordt niet meer gebruikt\"\n"
+"      Gebruik dit als u deze sleutel niet meer gebruikt.\n"
+"  \"Gebruikerscode is niet meer geldig\"\n"
+"      Gebruik dit om aan te geven dat de gebruikerscode niet langer moet\n"
+"      worden gebruikt; meestal wordt dit gebruikt om aan te geven dat een\n"
+"      e-mail adres niet meer geldig is.\n"
+
+#: g10/helptext.c:275
 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 ""
+"Als u dat wilt, kunt u een tekst invoeren die beschrijft waarom\n"
+"u dit herroepingscertificaat uitgeeft.  Hou de tekst a.u.b. kort.\n"
+"Een lege regel eindigt de tekst.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Geen hulp beschikbaar"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
 
-#: g10/keydb.c:178
-#, fuzzy, c-format
+#: g10/keydb.c:189
+#, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+msgstr "fout bij aanmaken sleutelbos `%s': %s\n"
 
-#: g10/keydb.c:185
-#, fuzzy, c-format
+#: g10/keydb.c:196
+#, c-format
 msgid "keyring `%s' created\n"
-msgstr "%s: sleutelbos aangemaakt\n"
+msgstr "sleutelbos `%s' aangemaakt\n"
 
-#: g10/keydb.c:575
-#, fuzzy, c-format
+#: g10/keydb.c:615
+#, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "%s: kon frommeltabel niet aanmaken: %s\n"
+msgstr "opnieuw opbouwen sleutelbos buffer mislukt: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
+msgstr "WAARSCHUWING: 2 bestanden met vertrouwelijke informatie bestaan.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
-msgstr "%s is de onveranderde\n"
+msgstr "%s is de ongewijzigde\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
-msgstr "Dicht dit mogelijke beveiligingsgat\n"
+msgstr "Repareer alstublieft dit mogelijke veiligheidsrisico\n"
 
-#: g10/keyring.c:1346
+#: g10/keyring.c:1360
 #, fuzzy, c-format
-msgid "checking keyring `%s'\n"
-msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+msgid "caching keyring `%s'\n"
+msgstr "bezig met controleren sleutelbos `%s'\n"
 
-#: g10/keyring.c:1377
+#: g10/keyring.c:1406
 #, fuzzy, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu sleutels zijn tot nu toe behandeld\n"
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu sleutels gecontroleerd (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1388
+#: g10/keyring.c:1418
 #, fuzzy, c-format
-msgid "%lu keys checked (%lu signatures)\n"
-msgstr "sleutels en ondertekeningen opnoemen"
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu sleutels gecontroleerd (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
-#~ msgstr ""
-#~ "u moet GnuPG opnieuw starten, zodat het het nieuwe optiebestand kan "
-#~ "inlezen\n"
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Kies een afbeelding om te gebruiken als uw foto ID.  De afbeelding moet een\n"
+"JPEG-bestand zijn. Bedenk dat deze afbeelding bewaard wordt in uw openbare\n"
+"sleutel.  Als u een hele grote afbeelding gebruikt, wordt uw sleutel ook "
+"erg\n"
+"groot!  Een afbeeldingsgrootte dichtbij 240x288 is het best.\n"
 
-#~ msgid "Fingerprint:"
-#~ msgstr "Vingerafdruk:"
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Geef JPEG-bestandsnaam voor foto ID: "
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "            Vingerafdruk:"
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Kan foto \"%s\" niet openen: %s\n"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
 
-#~ 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/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" is geen JPEG-bestand\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"
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Is deze foto goed (j/N/q)? "
 
-#, fuzzy
-#~ msgid "Are you sure you still want to sign it?\n"
-#~ msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "kan foto ID niet weergeven!\n"
 
-#, fuzzy
-#~ msgid "  Are you sure you still want to sign it?\n"
-#~ msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "uitvoeren van andere programma's niet ondersteund\n"
 
-#, fuzzy
-#~ msgid "Really sign? (y/N) "
-#~ msgstr "Echt tekenen? "
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "kan map `%s' niet aanmaken: %s\n"
 
-#~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"aanroepen van externe programma's zijn uit gezet vanwege onveilige opties-"
+"bestandstoegangsrechten\n"
 
-#~ msgid "Do you really need such a large keysize? "
-#~ msgstr "Heb je echt een sleutel nodig die zo lang is? "
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"dit platform vereist het maken van tijdelijke bestanden bij het aanroepen "
+"van externe programma's\n"
 
-#~ msgid "   signed by %08lX at %s\n"
-#~ msgstr "   getekend door %08lX op %s\n"
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "kan %s \"%s\" niet uitvoeren: %s\n"
 
-#~ msgid "--delete-secret-key user-id"
-#~ msgstr "--delete-secret-key gebruikersidentificatie"
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "systeemfout bij aanroepen van extern programma: %s\n"
 
-#~ msgid "--delete-key user-id"
-#~ msgstr "--delete-key gebruikersidentificatie"
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "ongewone afsluiting van extern programma\n"
 
-#, fuzzy
-#~ msgid "--delete-secret-and-public-key user-id"
-#~ msgstr "--delete-secret-and-public-key gebruikersidentificatie"
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "kan extern programma niet uitvoeren\n"
 
-#~ msgid "Enter the user ID: "
-#~ msgstr "Geef de gebruikersidentificatie: "
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "kan antwoord van extern programma niet lezen: %s\n"
 
-#~ msgid "skipped: public key already set with --encrypt-to\n"
-#~ msgstr "overgeslagen: openbare sleutel is al ingesteld met --encrypt-to\n"
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "WAARSCHUWING: kan tijdelijke bestand (%s) `%s' niet verwijderen: %s\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "WARNING: This is a PGP2-style key\n"
-#~ msgstr "LET OP: `%s' is een leeg bestand\n"
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "WAARSCHUWING: kan tijdelijke map `%s' niet verwijderen: %s\n"
 
-#~ msgid "sSmMqQ"
-#~ msgstr "sSmMqQ"
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "nooit"
 
-#~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr "geen sleutelserver bekend (gebruik de optie --keyserver)\n"
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet mislukt: %s\n"
 
-#~ msgid "%s: not a valid key ID\n"
-#~ msgstr "%s: ongeldig sleutelnummer\n"
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "sleutel %08lX: gebruikerscode niet gevonden\n"
 
-#, fuzzy
-#~ msgid "duplicate (short) key ID %08lX\n"
-#~ msgstr "openbare sleutel is %08lX\n"
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Zal worden herroepen door:\n"
 
-#, fuzzy
-#~ msgid "%lu key(s) to refresh\n"
-#~ msgstr "        %lu sleutels met fouten\n"
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Dit is een gevoelige herroepingssleutel)\n"
 
-#~ msgid "|[NAMES]|check the trust database"
-#~ msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Wilt u een herroepingscertificaat aanmaken voor deze sleutel? "
 
-#~ 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 ""
-#~ "Kon geen pad vinden dat leidt tot vertrouwen van de sleutel.  Laten we\n"
-#~ "eens proberen of we wat missende waarden kunnen invullen.\n"
-#~ "\n"
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII-bepantserde uitvoer afgedwongen.\n"
 
-#~ msgid ""
-#~ "No path leading to one of our keys found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Geen pad gevonden dat leidt naar een van onze sleutels.\n"
-#~ "\n"
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet mislukt: %s\n"
 
-#~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Geen certificaten gevonden zonder betrouwbaarheidswaarden.\n"
-#~ "\n"
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Herroepingscertificaat aangemaakt.\n"
 
-#~ msgid ""
-#~ "No trust values changed.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Betrouwbaarheidswaarden zijn niet veranderd.\n"
-#~ "\n"
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "geen herroepingssleutels gevonden voor `%s'\n"
 
-#~ msgid "%08lX: no info to calculate a trust probability\n"
-#~ msgstr "%08lx: geen informatie om een betrouwbaarheidskans te berekenen\n"
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "geheime sleutel `%s' niet gevonden: %s\n"
 
-#~ msgid "%s: error checking key: %s\n"
-#~ msgstr "%s: fout tijdens controleren van de sleutel: %s\n"
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "geen geassocieerde openbare sleutel: %s\n"
 
-#~ msgid "too many entries in unk cache - disabled\n"
-#~ msgstr "te veel ingangen in de unk cache - uitgezet\n"
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "openbare sleutel komt niet overeen met geheime sleutel!\n"
 
-#~ msgid "update of trustdb failed: %s\n"
-#~ msgstr "bijwerken van de vertrouwensdatabase ging niet goed: %s\n"
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "onbekend beschermingsalgoritme\n"
 
-#~ msgid "assuming bad MDC due to an unknown critical bit\n"
-#~ msgstr "foutieve MDC aangenomen wegens een onbekende kritische bit\n"
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "LET OP: deze sleutel wordt niet beschermd!\n"
 
-#~ msgid "error reading dir record for LID %lu: %s\n"
-#~ msgstr "fout tijdens lezen van indexveld voor LID %lu: %s\n"
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Herroepingscertificaat aangemaakt.\n"
+"\n"
+"Bewaar het alstublieft op een medium dat u kunt verstoppen; als boze\n"
+"Gijs er toegang toe krijgt, kan hij het gebruiken om uw sleutel onbruikbaar\n"
+"te maken. Het is slim om dit certificaat af te drukken en te verstoppen, in\n"
+"het geval dat het medium onleesbaar wordt.  Maar pas wel op:  uw afdruk-\n"
+"systeem bewaart mogelijk de gegevens en maakt ze beschikbaar voor\n"
+"anderen!\n"
 
-#~ msgid "lid %lu: expected dir record, got type %d\n"
-#~ msgstr "lid %lu: verwachtte indexveld, kreeg type %d\n"
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Kies alstublieft een reden voor de herroeping:\n"
 
-#~ msgid "no primary key for LID %lu\n"
-#~ msgstr "geen pimaire sleutel voor LID %lu\n"
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Annuleren"
 
-#~ msgid "error reading primary key for LID %lu: %s\n"
-#~ msgstr "fout tijdens het lezen van primaire sleutel voor LID %lu: %s\n"
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Waarschijnlijk wilt u hier %d kiezen)\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record mislukte: %s\n"
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Geef een optionele beschrijving; eindig met een lege regel:\n"
 
-#~ msgid "key %08lX: query record failed\n"
-#~ msgstr "sleutel %08lX: opvragen van veld mislukte\n"
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reden voor herroeping: %s\n"
 
-#~ msgid "key %08lX: already in trusted key table\n"
-#~ msgstr "sleutel %08lX: reeds aanwezig in de betrouwbare sleutel-tabel\n"
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Geen beschrijving gegeven)\n"
 
-#~ msgid "NOTE: secret key %08lX is NOT protected.\n"
-#~ msgstr "LET OP: geheime sleutel %08lX is NIET beveiligd.\n"
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Is dit goed? "
 
-#~ msgid "key %08lX: secret and public key don't match\n"
-#~ msgstr "sleutel %08lX: geheime en openbare sleutel horen niet bij elkaar\n"
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Lijst van toegewezen vertrouwenswaarden, gemaakt op %s\n"
+"# (Gebruik \"gpg --import-ownertrust\" om ze te herstellen)\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "nummeren van de geheime sleutels mislukte: %s\n"
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "kan bestand niet openen: %s\n"
 
-#~ msgid "key %08lX.%lu: Good subkey binding\n"
-#~ msgstr "sleutel %08lX.%lu: Goede subsleutelbinding\n"
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "regel te lang\n"
 
-#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-#~ msgstr "sleutel %08lX.%lu: Foutieve subsleutelbinding: %s\n"
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "fout: ontbrekende dubbele punt\n"
 
-#~ msgid "key %08lX.%lu: Valid key revocation\n"
-#~ msgstr "sleutel %08lX.%lu: Geldige sleutelterugtrekking\n"
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "fout: ongeldige vingerafdruk\n"
 
-#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-#~ msgstr "sleutel %08lX.%lu: Ongeldige sleutelterugtrekking: %s\n"
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "fout: geen eigenaarsvertrouwen waarde\n"
 
-#~ msgid "Good self-signature"
-#~ msgstr "Correcte zelfondertekening"
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "fout bij vinden vertrouwensgegevens: %s\n"
 
-#~ msgid "Invalid self-signature"
-#~ msgstr "Ongeldige zelfondertekening"
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "leesfout: %s\n"
 
-# User ID onvertaald
-#~ msgid "Valid user ID revocation skipped due to a newer self signature"
-#~ msgstr ""
-#~ "Geldig terugtrekkingscertificaat overgeslagen wegens een nieuwere "
-#~ "zelfondertekening"
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[bestanden]|bestanden coderen"
 
-#~ msgid "Valid user ID revocation"
-#~ msgstr "Geldig terugtrekkingscertificaat voor gebruiker"
+#~ msgid "store only"
+#~ msgstr "alleen opslaan"
 
-#~ msgid "Invalid user ID revocation"
-#~ msgstr "Ongeldig terugtrekkingscertificaat voor gebruiker"
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[bestanden]|bestanden decoderen"
 
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Geldige terugtrekking van certificaat"
+#~ msgid "sign a key non-revocably"
+#~ msgstr "een sleutel onherroepbaar ondertekenen"
 
-#~ msgid "Good certificate"
-#~ msgstr "Correct certificaat"
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "een sleutel lokaal en onherroepbaar ondertekenen"
 
-#~ msgid "Invalid certificate revocation"
-#~ msgstr "Ongeldige terugtrekking van certificaat"
+#~ msgid "list only the sequence of packets"
+#~ msgstr "slechts de reeks van pakketten opsommen"
 
-#~ msgid "Invalid certificate"
-#~ msgstr "Ongeldig certificaat"
+#~ msgid "export the ownertrust values"
+#~ msgstr "de eigenaarsvertrouwen-waarden uitvoeren"
 
-#~ msgid "sig record %lu[%d] points to wrong record.\n"
-#~ msgstr "ondert. veld %lu[%d] wijst naar een verkeerd veld.\n"
+#~ msgid "import ownertrust values"
+#~ msgstr "eigenaarsvertrouwen-waarden invoeren"
 
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "dubbel certificaat - verwijderd"
+#~ msgid "unattended trust database update"
+#~ msgstr "automatische vertrouwensgegevensbank bijwerking"
 
-#~ msgid "tdbio_search_dir failed: %s\n"
-#~ msgstr "tdbio_search_dir mislukte: %s\n"
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "een kapotte vertrouwensgegevensbank repareren"
 
-#~ msgid "lid ?: insert failed: %s\n"
-#~ msgstr "lid ?: invoegen mislukte: %s\n"
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Een bestand of standaardinvoer ontpantseren"
 
-#~ msgid "lid %lu: insert failed: %s\n"
-#~ msgstr "lid %lu: invoegen mislukte: %s\n"
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Een bestand of standaardinvoer bepantseren"
 
-#~ msgid "lid %lu: inserted\n"
-#~ msgstr "lid %lu: ingevoegd\n"
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAAM|NAAM gebruiken als standaardontvanger"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "fout bij het lezen van indexveld: %s\n"
+#~ msgid "use the default key as default recipient"
+#~ msgstr "de standaardsleutel gebruiken als standaardontvanger"
 
-#~ msgid "\t%lu keys inserted\n"
-#~ msgstr "        %lu sleutels ingevoegd\n"
+#~ msgid "don't use the terminal at all"
+#~ msgstr "helemaal niet de terminal gebruiken"
 
-#~ msgid "enumerate keyblocks failed: %s\n"
-#~ msgstr "nummeren van de sleutelblokken mislukte: %s\n"
+#~ msgid "force v3 signatures"
+#~ msgstr "versie 3 ondertekeningen afdwingen"
 
-#~ msgid "lid %lu: dir record w/o key - skipped\n"
-#~ msgstr "lid %lu: indexveld zonder sleutel - overgeslagen\n"
+#~ msgid "do not force v3 signatures"
+#~ msgstr "niet versie 3 ondertekeningen afdwingen"
 
-#~ msgid "\t%lu due to new pubkeys\n"
-#~ msgstr "        %lu vanwege nieuwe openbare sleutels\n"
+#~ msgid "force v4 key signatures"
+#~ msgstr "versie 4 sleutelondertekeningen afdwingen"
 
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "        %lu sleutels overgeslagen\n"
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "niet versie 4 sleutelondertekeningen afdwingen"
 
-#~ msgid "\t%lu keys updated\n"
-#~ msgstr "        %lu sleutels bijgewerkt\n"
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "altijd een MDC gebruiken voor codering"
 
-#~ msgid "Ooops, no keys\n"
-#~ msgstr "Ooeeps, geen sleutels\n"
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "nooit een MDC gebruiken voor codering"
 
-#~ msgid "Ooops, no user IDs\n"
-#~ msgstr "Ooeeps, geen gebruikersidentificaties\n"
+#~ msgid "use the gpg-agent"
+#~ msgstr "de gpg-agent gebruiken"
 
-#~ msgid "check_trust: search dir record failed: %s\n"
-#~ msgstr "check_trust: zoeken naar indexveld mislukte: %s\n"
+#~ msgid "batch mode: never ask"
+#~ msgstr "batch-modus: nooit vragen"
 
-#~ msgid "key %08lX: insert trust record failed: %s\n"
-#~ msgstr "sleutel %08lX: invoegen van vertrouwensveld mislukte: %s\n"
+#~ msgid "assume yes on most questions"
+#~ msgstr "ja aannemen bij de meeste vragen"
 
-#~ msgid "key %08lX.%lu: inserted into trustdb\n"
-#~ msgstr "sleutel %08lX.%lu: ingevoegd in de vertrouwensdatabase\n"
+#~ msgid "assume no on most questions"
+#~ msgstr "nee aannemen bij de meeste vragen"
 
-#~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "deze sleutelbos toevoegen aan de lijst van sleutelbossen"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "deze geheime sleutelbos toevoegen aan de lijst"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "weergeven op welke sleutelbos een opgesomde sleutel zit"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NAAM|NAAM gebruiken als standaard geheime sleutel"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|deze sleutelserver gebruiken om sleutels op te zoeken"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAAM|terminal tekenset instellen op NAAM"
+
+#~ msgid "read options from file"
+#~ msgstr "opties lezen uit een bestand"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[bestand]|statusinfo naar dit bestand schrijven"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|SLEUTEL|deze sleutel maximaal vertrouwen"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|BESTAND|uitbreidingsmodule BESTAND laden"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "de modus beschreven in RFC1991 emuleren"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
 #~ msgstr ""
-#~ "sleutel %08lX.%lu: aangemaakt in de toekomst (tijdsverschuiving of "
-#~ "klokprobleem)\n"
+#~ "alles pakket-, codering- en digestopties instellen op OpenPGP gedrag"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr "alle pakket-, codering- en digestopties instellen op PGP 2.x gedrag"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|wachtwoordmodus N gebruiken"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NAAM|berichtdigest-algoritme NAAM gebruiken voor wachtwoorden"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NAAM|codeeralgoritme NAAM gebruiken voor wachtwoorden"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NAAM|codeeralgoritme NAAM gebruiken"
 
-#~ msgid "key %08lX.%lu: expired at %s\n"
-#~ msgstr "sleutel %08lX.%lu: vervallen op %s\n"
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NAAM|berichtdigest-algoritme NAAM gebruiken"
 
-#~ msgid "key %08lX.%lu: trust check failed: %s\n"
-#~ msgstr "sleutel %08lX.%lu: betrouwbaarheidscontrole mislukt: %s\n"
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|inpakalgoritme N gebruiken"
 
-#~ msgid "user '%s' not found: %s\n"
-#~ msgstr "gebruiker `%s' niet gevonden: %s\n"
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "keyid-veld uit gecodeerde pakketten gooien"
 
-#~ msgid "problem finding '%s' in trustdb: %s\n"
-#~ msgstr "kon `%s' niet opzoeken in de vertrouwensdatabase: %s\n"
+#~ msgid "Show Photo IDs"
+#~ msgstr "Foto's weergeven"
 
-#~ msgid "user '%s' not in trustdb - inserting\n"
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Niet foto's weergeven"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Opdrachtregel instellen voor weergeven van foto's"
+
+#, fuzzy
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "digest-algoritme `%s' is alleen-lezen in deze uitgave\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "inpakalgoritme moet binnen bereik %d..%d liggen\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
 #~ msgstr ""
-#~ "gebruiker '%s' komt niet voor in de vertrouwensdatabase - invoegen\n"
+#~ "%08lX: Het is niet zeker dat deze sleutel echt van de eigenaar is,\n"
+#~ "maar de sleutel is toch geaccepteerd\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "voorkeur %c%lu is niet geldig\n"
 
-#~ msgid "failed to put '%s' into trustdb: %s\n"
-#~ msgstr "kon '%s' niet invoegen in de vertrouwensdatabase: %s\n"
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "sleutel %08lX: niet een rfc2440 sleutel - overgeslagen\n"
 
-#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
 #~ msgstr ""
-#~ "Wilt u echt een sleutel maken om mee te ondertekenen en versleutelen? "
+#~ "LET OP: Elgamal primaire sleutel gevonden - het invoeren kan even duren\n"
 
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: gebruiker niet gevonden: %s\n"
+#~ msgid " (default)"
+#~ msgstr " (standaard)"
 
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "leesprobleem voor certificaat: %s\n"
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  gemaakt: %s verloopt: %s"
 
-#~ msgid "can't lock keyring `%s': %s\n"
-#~ msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
+#~ msgid "Notation: "
+#~ msgstr "Notatie: "
 
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: gebruiker niet gevonden\n"
+#~ msgid "Policy: "
+#~ msgstr "Beleid: "
 
-#~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr "LET OP: kan nog geen lange voorkeursblokken verwerken\n"
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "bezig met opvragen sleutel %08lX van %s\n"
 
-#~ msgid "%s: can't create keyring: %s\n"
-#~ msgstr "%s: kan sleutelbos niet aanmaken: %s\n"
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "kan sleutel niet ontvangen van sleutelserver: %s\n"
 
-#, fuzzy
-#~ msgid "invalid"
-#~ msgstr "ongeldige versleuteling"
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "fout bij verzenden aan `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "succes bij zenden aan `%s' (status=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "verzenden aan `%s' mislukt: status=%u\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "bezig met zoeken naar \"%s\" bij HKP-server %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "kan niet zoeken op sleutelserver: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "sleutel %08lX: dit is een met PGP aangemaakte ElGamal-sleutel die NIET "
+#~ "veilig is voor ondertekeningen!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "sleutel %08lX is %lu seconde in de toekomst gemaakt (tijdsreis of "
+#~ "klokprobleem)\n"
 
-#~ msgid "RSA key cannot be used in this version\n"
-#~ msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "sleutel %08lX is %lu seconden in de toekomst gemaakt (tijdsreis of "
+#~ "klokprobleem)\n"
 
-#~ msgid "No key for user ID\n"
-#~ msgstr "Geen sleutel voor gebruikersidentificatie\n"
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "sleutel %08lX gemarkeerd als maximaal vertrouwd\n"
 
-#~ msgid "No user ID for key\n"
-#~ msgstr "Geen gebruikersidentificatie voor sleutel\n"
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "bezig met controleren op diepte %d ondertekend=%d ot(-/q/n/m/f/u)=%d/%d/%"
+#~ "d/%d/%d/%d\n"
 
-#~ msgid "no secret key for decryption available\n"
-#~ msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Kies het te gebruiken algoritme.\n"
+#~ "\n"
+#~ "DSA (ofwel DSS) is het digitale ondertekening algoritme dat alleen kan\n"
+#~ "worden gebruikt voor ondertekeningen.  Dit is het voorgestelde algoritme\n"
+#~ "omdat verificatie van DSA-ondertekeningen veel sneller is dan van "
+#~ "ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is een algoritme dat kan worden gebruikt voor ondertekenen en\n"
+#~ "coderen. OpenPGP onderscheidt twee smaken van dit algoritme: een alleen-\n"
+#~ "coderen en een coderen+coderen versie; ze zijn eigenlijk hetzelfde, maar\n"
+#~ "sommige parameters moeten op een speciale manier worden gekozen\n"
+#~ "om veilige sleutels voor ondertekenen te maken: dit programma\n"
+#~ "doet dit maar andere OpenPGP-implementaties hoeven de coderen+\n"
+#~ "ondertekenen smaak niet te begrijpen.\n"
+#~ "\n"
+#~ "De eerste (primaire) sleutel moet altijd een sleutel zijn waarmee kan\n"
+#~ "ondertekend kan worden; dit is de reden dat de alleen-coderen ElGamal-\n"
+#~ "sleutel niet beschikbaar is in dit menu."
 
 #~ msgid ""
-#~ "RSA keys are deprecated; please consider creating a new key and use this "
-#~ "key in the future\n"
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "RSA sleutels zijn verouderd; overweeg a.u.b. het aanmaken van een\n"
-#~ "nieuwe sleutel om in de toekomst te gebruiken\n"
+#~ "Ondanks dat deze sleutels gedefinieerd zijn in RFC2440 worden ze niet\n"
+#~ "aangeraden omdat ze niet door alle programma's worden ondersteund\n"
+#~ "en omdat de ondertekeningen die ermee worden gemaakt behoorlijk\n"
+#~ "groot zijn en traag om te verifiëren."
 
-#~ msgid "set debugging flags"
-#~ msgstr "zet afluistervlaggen"
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "tot nu toe %lu sleutels gecontroleerd (%lu ondertekeningen)\n"
 
-#~ msgid "enable full debugging"
-#~ msgstr "sta volledige aflustering toe"
+#~ msgid "key incomplete\n"
+#~ msgstr "sleutel onvolledig\n"
 
-#~ msgid "do not write comment packets"
-#~ msgstr "schrijf geen commentaarpakketten"
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "sleutel %08lX onvolledig\n"
 
-#~ msgid "(default is 1)"
-#~ msgstr "(standaard is 1)"
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (ondertekenen en coderen)\n"
 
-#~ msgid "(default is 3)"
-#~ msgstr "(standaard is 3)"
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "Het gebruik van dit algoritme wordt alleen ondersteund door GnuPG.  U "
+#~ "zult met\n"
+#~ "deze sleutel niet kunnen communiceren met PGP gebruikers.  Dit algoritme "
+#~ "is\n"
+#~ "ook erg langzaam, en mogelijk niet zo veilig als de andere keuzes.\n"
 
-#~ msgid "   (%d) ElGamal in a v3 packet\n"
-#~ msgstr "   (%d) ElGamal in een v3 pakket\n"
+#~ msgid "Create anyway? "
+#~ msgstr "Toch aanmaken? "
 
-#~ msgid "Key generation can only be used in interactive mode\n"
-#~ msgstr "Sleutelgeneratie kan alleen gebruikt worden in interactieve modus\n"
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "deze sleutelserver is niet helemaal HKP-compatibel\n"
diff --git a/po/pl.po b/po/pl.po
index 5557177d3..195d3ed80 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,13 +2,14 @@
 # Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 # Janusz A. Urbanowicz <[email protected]>, 1999, 2000, 2001, 2002.
 #
-# To be included in GnuPG 1.0.7
+# To be included in GnuPG 1.2.2
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.0.6\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-04-28 02:44+02:00\n"
+"Project-Id-Version: gnupg-1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -23,54 +24,70 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "Ostrze�enie: u�ywana pami�� nie jest pami�ci� bezpieczn�!\n"
+msgstr "OSTRZE�ENIE: nie mo�na zabezpieczy� u�ywanej pami�ci!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "obja�nienie mo�na przeczyta� tutaj: http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "operacja niemo�liwa do wykonania bez dost�pnej pami�ci bezpiecznej\n"
+msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "tT"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "wyj�cie"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "wW"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "l"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "b��d og�lny"
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "nieznany rodzaj pakietu"
+msgstr "nieznany typ pakietu"
 
 #: util/errors.c:56
 msgid "unknown version"
@@ -78,7 +95,7 @@ msgstr "nieznana wersja"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "nieznany algorytm klucza publicznego"
+msgstr "nieznany algorytm asymetryczny"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
@@ -90,7 +107,7 @@ msgstr "niepoprawny klucz publiczny"
 
 #: util/errors.c:60
 msgid "bad secret key"
-msgstr "niepoprawny klucz tajny"
+msgstr "niepoprawny klucz prywatny"
 
 #: util/errors.c:61
 msgid "bad signature"
@@ -102,11 +119,11 @@ msgstr "b��d sumy kontrolnej"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "niepoprawne d�ugie has�o."
+msgstr "niepoprawne has�o"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "brak klucza publicznego."
+msgstr "brak klucza publicznego"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
@@ -122,7 +139,7 @@ msgstr "niepoprawny pakiet"
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "b��d w opakowaniu ASCII."
+msgstr "b��d w opakowaniu ASCII"
 
 #: util/errors.c:69
 msgid "no such user id"
@@ -130,11 +147,11 @@ msgstr "brak takiego identyfikatora u�ytkownika."
 
 #: util/errors.c:70
 msgid "secret key not available"
-msgstr "brak klucza tajnego."
+msgstr "brak klucza prywatnego"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "zosta� u�yty niew�a�ciwy klucz tajny"
+msgstr "zosta� u�yty niew�a�ciwy klucz prywatny"
 
 #: util/errors.c:72
 msgid "not supported"
@@ -142,15 +159,15 @@ msgstr "nie jest obs�ugiwany"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "niepoprawny klucz."
+msgstr "niepoprawny klucz"
 
 #: util/errors.c:74
 msgid "file read error"
-msgstr "b��d przy odczycie pliku."
+msgstr "b��d przy odczycie pliku"
 
 #: util/errors.c:75
 msgid "file write error"
-msgstr "b��d przy zapisie pliku."
+msgstr "b��d przy zapisie pliku"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
@@ -182,7 +199,7 @@ msgstr "nieznana klasa podpisu"
 
 #: util/errors.c:83
 msgid "trust database error"
-msgstr "b��d w bazie zaufania."
+msgstr "b��d w bazie zaufania"
 
 #: util/errors.c:84
 msgid "bad MPI"
@@ -222,11 +239,11 @@ msgstr "nieoczekiowane dane"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
-msgstr "konflikt znacznik�w czasu"
+msgstr "konflikt datownik�w"
 
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
-msgstr "nieu�yteczny algorytm z kluczem publicznym"
+msgstr "nieu�yteczny algorytm asymetryczny"
 
 #: util/errors.c:95
 msgid "file exists"
@@ -260,89 +277,95 @@ msgstr "nie zaszyfrowany"
 msgid "not processed"
 msgstr "nie zosta� przetworzony"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "bezu�yteczny klucz publiczny"
 
 #: util/errors.c:106
 msgid "unusable secret key"
-msgstr "bezu�yteczny klucz tajny"
+msgstr "bezu�yteczny klucz prywatny"
 
 #: util/errors.c:107
 msgid "keyserver error"
 msgstr "b��d serwera kluczy"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... to jest b��d w programie (%s:%d:%s)\n"
+msgstr "... to jest b��d programu (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "nie mo�na otworzy� %s: %s\n"
+msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "nie mo�na sprawdzi� %s: %s\n"
+msgstr "nie mo�na sprawdzi� ,,%s'': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "'%s' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
+msgstr ",,%s'' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
-"ostrze�enie: plik random_seed ma niew�a�ciwy rozmiar - nie zostanie u�yty\n"
+"OSTRZE�ENIE: niew�a�ciwy rozmiar pliku random_seed - nie zostanie u�yty\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "nie mo�na odczyta� %s: %s\n"
+msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "nie mo�na stworzy� %s: %s\n"
+msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "nie mo�na zapisa� %s: %s\n"
+msgstr "nie mo�na zapisa� ,,%s'': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "nie mo�na zamkn�� %s: %s\n"
+msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -368,7 +391,35 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "w tej wersji algorytm skr�tu ,,%s'' jest tylko do odczytu\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Prosz� czeka�, prowadzona jest zbi�rka losowo�ci. �eby si� nie nudzi�, "
+"mo�esz\n"
+"popracowa� w systemie, przy okazji dostarczy to systemowi wi�cej entropii "
+"do\n"
+"tworzenia liczb losowych.\n"
+"\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -376,167 +427,128 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
-msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
+msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[pliki]|szyfrowanie plik�w"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "tylko zapis danych w formacie OpenPGP"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
-msgstr "odszyfrowywanie danych (domy�lnie)"
-
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[pliki]|odszyfrowywanie plik�w"
+msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
-msgstr "lista kluczy tajnych"
+msgstr "lista kluczy prywatnych"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
-msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
+msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr ""
-"z�o�enie na kluczu podpisu nie podlegaj�cego \n"
-"uniewa�nieniu"
-
-#: g10/g10.c:333
-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:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
-msgstr "od�wie�enie kluczy z serwera"
+msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "wypisane sekwencji pakiet�w"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "eksport warto�ci zaufania"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "wczytanie warto��i zaufania"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "automatyczne uaktualnienie bazy zaufania"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "naprawa uszkodzonej bazy zaufania"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "zdj�cie opakowania ASCII pliku lub potoku"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "opakowanie ASCII pliku lub potoku"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -546,195 +558,55 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
-msgstr "plik wynikowy w opakowaniu ASCII"
+msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "domy�lny klucz jest domy�lnym adresatem"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|poziom kompresji N (0 - brak)"
+msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
-msgstr "z informacjami dodatkowymi"
-
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "mniej komunikat�ww"
+msgstr "z dodatkowymi informacjami"
 
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "bez odwo�a� do terminala"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "wymuszenie trzeciej wersji formatu podpis�w"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "bez wymuszania trzeciej wersji formatu podpis�w"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "wymuszenie czwartej wersji formatu podpis�w"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "bez wymuszania czwartej wersji formatu podpis�w"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "do szyfrowania b�dzie u�ywany MDC"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "do szyfrowania nie zostanie u�yty MDC"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "wykorzystanie gpg-agenta"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "tryb wsadowy: �adnych pyta�"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "doda� zbi�r kluczy do listy u�ywanych"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "doda� zbi�r kluczy tajnych do listy"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "okazanie, w kt�rym zbiorze kluczy znajduje si� dany klucz"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "wczytanie opcji z pliku"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|zapisa� opis stanu do FD"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[plik]|zapisa� opis stanu do pliku"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|KLUCZ|klucz ca�kowicie zaufany"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emulacja trybu opisanego w RFC1991"
-
-#: g10/g10.c:442
-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:443
-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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|N-ty tryb obliczania has�a"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|ALG|algorytm skr�tu dla has�a ALG"
+msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|algorytm kompresji N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "usuni�cie numer�w kluczy adresat�w z zaszyfrowanych pakiet�w"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "okazanie identyfikatora - zdj�cia u�ytkownika"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "bez pokazywania zdj��"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "polecenie wywo�ania przegl�darki do zdj��"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -742,7 +614,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -763,15 +635,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -781,7 +653,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -789,449 +661,665 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Asymetryczne: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Symetryczne: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Skr�t�w: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Kompresji: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
+msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
 msgstr ""
+"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
+"                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1193
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "Ostrze�enie: niebezpieczne prawa w�asno�ci do %s \"%s\".\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr ""
+"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
+"                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1196
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "Ostrze�enie: niebezpieczne prawa dost�pu do %s \"%s\".\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr ""
+"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
+"                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1202
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "Ostrze�enie: niebezpieczne prawa w�asno�ci do %s \"%s\".\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr ""
+"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
+"                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1205
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "Ostrze�enie: niebezpieczne prawa dost�pu do %s \"%s\".\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr ""
+"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
+"                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1208
 #, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr ""
+"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
+"                  zawieraj�cego %s ,,%s''\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "nieznana opcja ,,%s''\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
+msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
+msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "plik opcji '%s': %s\n"
+msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "odczyt opcji z '%s'\n"
+msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
+"modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
+"dost�pu\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "OSTRZE�ENIE: '%s' jest przestarza�� opcj�.\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "niepoprawne opcje eksportu kluczy\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "b��d w opakowaniu ASCII."
+msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "OSTRZE�ENIE: '%s' jest przestarza�� opcj�.\n"
+msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "b��d w zbiorze kluczy"
+msgstr "niepoprawne opcje eksportu kluczy\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "niepoprawne opcje wczytania kluczy\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "niepoprawne opcje eksportu kluczy\n"
+
+#: g10/g10.c:2208
 #, 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:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s nie ma sensu z %s!\n"
+msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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:1737
+#: g10/g10.c:2441
 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:1743
+#: g10/g10.c:2447
 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:1756
+#: g10/g10.c:2460
 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:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "tej wiadomo�ci mo�e nie da� si� odczyta� za pomoc� PGP 2.x\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
-msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
+msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1845
-#, 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:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr ""
+"niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr ""
+"niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 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:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "niew�a�ciwe ustawienia\n"
+msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "niew�a�ciwe ustawienia\n"
+msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "niew�a�ciwe ustawienia\n"
+msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "niew�a�ciwe ustawienia\n"
+msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s jeszcze nie dzia�a z %s!\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
+
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
+msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [plik]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "%s nie jest dost�pne w trybie %s\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [plik]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "%s nie jest dost�pne w trybie %s\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "eksport kluczy nie powi�d� si�: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "nie mo�na otworzy� ,%s'\n"
+msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
+"i musi ko�czy� si� ,,=''\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
-msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
+msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/g10.c:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
-msgstr "podany URL regulaminu certyfikacji jest niepoprawny\n"
+msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "mniej komunikat�ww"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "pobieranie kluczy z tego zbioru"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "nie traktowa� konfliktu datownik�w jako b��du"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|pisanie opisu stanu do deskryptora FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sk�adnia: gpgm [opcje] [pliki]\n"
+"Sprawdzanie podpis�w ze znanych zaufanych kluczy\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
-msgstr "niew�a�ciwy nag��wek czytelnego podpisanego dokumentu\n"
+msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
-msgstr "zagnie�d�one podpisy na czytelnym dokumencie\n"
+msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
+msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
-"przek�amanie wprowadzone przez program transportowy poczty\n"
+"przek�amanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
-msgstr "Nie podano przyczyny"
+msgstr "nie podano przyczyny"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
-msgstr "Klucz zosta� zast�piony"
+msgstr "klucz zosta� zast�piony"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
-msgstr "Klucz zosta� skompromitowany"
+msgstr "klucz zosta� skompromitowany"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
-msgstr "Klucz nie jest ju� u�ywany"
+msgstr "klucz nie jest ju� u�ywany"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
-msgstr "Identyfikator u�ytkownika przesta� by� poprawny"
+msgstr "identyfikator u�ytkownika przesta� by� poprawny"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "Pow�d uniewa�nienia: "
+msgstr "pow�d uniewa�nienia: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Komentarz do uniewa�nienia: "
+msgstr "komentarz do uniewa�nienia: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMwWpP"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Brak warto�ci zaufania dla:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                        alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                        alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1239,190 +1327,213 @@ msgid ""
 "\n"
 msgstr ""
 "Zastan�w si� jak bardzo ufasz temu u�ytkownikowi w kwestii sprawdzania\n"
-"to�samo�ci innych w�a�cicieli kluczy (czy sprawdzi on odciski klucza \n"
-"pobrane z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.)?\n"
+"to�samo�ci innych u�ytkownik�w (czy sprawdzi on odciski kluczy pobrane\n"
+"z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
+"\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = nie wiem\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = NIE ufam mu\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = ufam absolutnie\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = powr�t do g��wnego menu\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " p = pomini�cie klucza\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " w = wyj�cie\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Czy na pewno chcesz przypisa� absolutne zaufanie temu kluczowi? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "klucz %08lX: klucz zosta� uniewa�niony!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "klucz %08lX: podklucz zosta� uniewa�niony!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: data wa�no�ci klucza up�yn�a\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr "%08lX: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NIE UFAMY temu kluczowi\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
-msgstr ""
-"%08lX: Nie ma pewne, do do kogo nale�y ten klucz, ale jest akceptowalny.\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "%08lX: Nie ma pewno�ci co do to�samo�ci w�a�ciciela klucza.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Ten klucz prawdopodobnie nale�y do tej osoby.\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale�y do nas\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"NIE MA pewno�ci, do kogo nale�y ten klucz. Je�li nie masz co do\n"
-"tego �adnych w�tpliwo�ci i *naprawd�* wiesz co robisz mo�esz\n"
-"odpowiedzie� \"tak\" na nast�pne pytanie.\n"
+"NIE MA pewno�ci, czy klucz nale�y do osoby wymienionej w identyfikatorze.\n"
+"Je�li nie masz co do tego �adnych w�tpliwo�ci i *naprawd�* wiesz co robisz,\n"
+"mo�esz odpowiedzie� ,,tak'' na nast�pne pytanie.\n"
+"\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony\n"
+"             (brak klucza uniewa�niaj�cego aby to sprawdzi�)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "             To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "             Ten podpis prawdopodobnie jest FA�SZERSTWEM.\n"
+msgstr "             Ten podpis prawdopodobnie jest FA�SZYWY.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�c zaufane podpisy!\n"
+"OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%s nie jest dost�pne w trybie %s\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: pomini�ty: zosta� ju� wybrany\n"
+msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1430,130 +1541,126 @@ msgstr ""
 "\n"
 "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
-msgstr "Klucz publiczny wy��czony z uzycia.\n"
+msgstr "Klucz publiczny wy��czony z u�ycia.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
-msgstr "pomini�ty: zosta� ju� wybrany\n"
+msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
-msgstr "nieznany domy�lny adresat '%s'\n"
+msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ycia\n"
+msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr "ustawienie %c%lu jest niepoprawne\n"
-
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "ustawienie %c%lu powtarza si�\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "zbyt wiele `%c' ustawie�\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "zapis podpisu klucza nim samym\n"
+msgstr "zapis podpisu bezpo�redniego\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, 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:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: 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:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1566,49 +1673,41 @@ msgstr ""
 "               domy�lny rozmiar klucza wynosi 1024 bity\n"
 "  najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 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:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
-"Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� obliczenia\n"
-"trwaj� wtedy BARDZO d�ugo!\n"
+"Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� potrzebne\n"
+"obliczenia trwaj� wtedy BARDZO d�ugo!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1616,17 +1715,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "��dana d�ugo�� klucza to %u bity.\n"
+msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1642,7 +1741,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:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1658,30 +1757,29 @@ 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:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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"
+msgstr "%s nie ma daty wa�no�ci\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1689,11 +1787,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
-msgstr "Dane poprawne (t/n)? "
+msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1703,50 +1801,50 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Musisz okre�li� identyfikator u�ytkownika aby mo�na by�o rozpozna� tw�j\n"
-"klucz; program z�o�y go z twojego imienia i nazwiska, komentarza i adresu\n"
-"poczty elektronicznej. B�dzie on mia� tak� posta�:\n"
-"    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
+"Musisz poda� identyfikator u�ytkownika aby mo�na by�o rozpozna� tw�j klucz;\n"
+"program z�o�y go z twojego imienia i nazwiska, komentarza i adresu poczty\n"
+"elektronicznej. B�dzie on mia�, na przyk�ad, tak� posta�:\n"
+"    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 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:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1757,49 +1855,47 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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��? "
+msgstr "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj��? "
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1542
 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 ? "
+"Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, przej�� (D)alej,\n"
+"czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 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:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1811,80 +1907,87 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"Musimy wygenerowa� du�o losowych bajt�w. Dobrym pomys�em podczas "
-"generowania\n"
-"liczb pierszych jest wykonanywanie w tym czasie innych dzia�a� (pisanie na\n"
-"klawiaturze, poruszanie myszk�, odwo�anie si� do dysk�w); dzi�ki temu\n"
-"generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci "
+"Musimy wygenerowa� du�o losowych bajt�w. Dobrym pomys�em aby pom�c "
+"komputerowi\n"
+"podczas generowania liczb pierszych jest wykonywanie w tym czasie innych\n"
+"dzia�a� (pisanie na klawiaturze, poruszanie myszk�, odwo�anie si� do "
+"dysk�w);\n"
+"dzi�ki temu generator liczb losowych ma mo�liwo�� zebrania odpowiedniej "
+"ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "niestety, to nie dzia�a w trybie wsadowym\n"
+
+#: g10/keygen.c:2267
 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:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "zapisuj� klucz tajny w '%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "b��d podczas zapisu zbioru kluczy publicznych `%s': %s\n"
+msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "b��d podczas zapisu zbioru kluczy tajnych `%s': %s\n"
+msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "klucz zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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 ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
-"mo�na doda� do niego podklucz u�ywany do szyfrowania.\n"
+"mo�na doda� do niego podklucz szyfruj�cy.\n"
 
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1892,7 +1995,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1900,563 +2003,637 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
-msgstr "Na pewno utworzy�? "
+msgstr "Czy na pewno utworzy�? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mo�na otworzy�: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
+"ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "szyfrem %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
-msgstr "`%s' ju� jest spakowany\n"
+msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
+msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, 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:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
+msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s zaszyfrowany dla: %s\n"
+msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "klucz `%s' nie zosta� odaleziony: %s\n"
+msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: g10/export.c:222
-#, 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:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
-"Niepoprawny klucz %08lX uznany za poprawny przez --allow non-selfsigned-"
-"uid.\n"
+"Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "b��d odczytu '%s': %s\n"
+msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "         do��czono do zbioru: %lu"
+msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/import.c:597
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:612
+#: g10/import.c:600
 #, 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"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
-msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
+msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "klucz %08lX: klucz publiczny wczytano do zbioru\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:685
-#, 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:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "klucz %08lX: 1 nowy podpis\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "klucz %08lX: %d nowych podpis�w\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "klucz %08lX: 1 nowy podklucz\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
+
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "klucz %08lX: %d nowych podkluczy\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:774
+#: g10/import.c:1047
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "klucz %08lX: bez zmian\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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"
+"klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
+"              uniwa�nienia\n"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1030
-#, 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:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, 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:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "klucz %08lX.%lu: Poprawne uniewa�nienie podklucza\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, 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:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
-"klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
-"miejscu - zosta� pomini�ty\n"
+"klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
+"              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1220
-#, 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:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "klucz %08lX: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr ""
-"klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
-"miejscu - zosta� pomini�ty\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1330
-#, 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:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1389
+#: g10/import.c:1698
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"Ostrze�enie: klucz %08lX m�g� zosta� uniewazniony:\n"
+"OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1403
+#: g10/import.c:1711
 #, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"Ostrze�enie: klucz %08lX m�g� zosta� uniewa�niony:\n"
+"OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 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:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, 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:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "wykryto 1 identyfikator u�ytkownika bez podpisu w�a�ciciela klucza\n"
+msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, 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"
+"wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = mam ograniczone zaufanie\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = mam pe�ne zaufanie\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "Identyfikator u�ytkownika \"%s\" zosta� uniewa�niony."
+msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
+
+#: g10/keyedit.c:584
+#, 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"
+"Podpis klucza nim samym na ,,%s''\n"
+"jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
 msgstr ""
-"Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
+"Tw�j podpis na \"%s\"\n"
+"przekroczy� dat� wa�no�ci.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2465,80 +2642,89 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 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:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 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:535
+#: g10/keyedit.c:759
 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"
+msgstr ""
+"W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 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:560
+#: g10/keyedit.c:786
 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 ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
-"Je�li nie wiesz co odpowiedzie�, podaj \"0\".\n"
+"Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2546,40 +2732,39 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
+msgstr ""
+"\n"
+"To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n"
+"OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 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"
+"OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n"
+"Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2587,7 +2772,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2595,7 +2780,7 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2603,7 +2788,7 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2611,41 +2796,42 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Czy na pewno podpisa�? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Wprowad� nowe d�ugie has�o dla tego klucza tajnego.\n"
+"Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2653,953 +2839,1192 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "podpis"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "z�o�enie podpisu oddzielonego od dokumentu"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
-msgstr "z�o�enie lokalnego podpisu na kluczu"
+msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nupodpis"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "z�o�enie na kluczu podpisu nie podlegaj�cego uniewa�nieniu"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nulpodpis"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
-msgstr "z�o�enie na kluczu lokalnego podpisu nie podlegaj�cego uniewa�nieniu"
+msgstr "z�o�enie na kluczu prywatnego podpisu nie podlegaj�cego uniewa�nieniu"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "dodfoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "usfoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "uniewa�niony"
+msgstr "dodun"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "dodanie podklucza"
+msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "uspod"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "usuni�cie podpis�w"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "g��wny"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
-msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
+msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "opcje"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "ustaw"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "aktopc"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "b��d serwera kluczy"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "niezrozuma�y URI serwera kluczy\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "unpod"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "uniewa�nienie identyfikatora u�ytkownika"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "wy�kl"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "w�kl"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "foto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, 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:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "ustawienie opcji klucza"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
-msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
+msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
+msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
-msgstr ""
-"Klucz nie zosta� zmieniony wi�c naniesienie poprawek nie jest konieczne.\n"
+msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Skr�t: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Ustawienia: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
 msgid "This key may be revoked by %s key "
-msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s %s%s.\n"
+msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (poufne)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[uniewa�niony]"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [wygasa :%s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [wygasa :%s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "podklucz zosta� uniewa�niony: %s\n"
+msgstr "un! podklucz zosta� uniewa�niony: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
-msgstr "fa�szywy certyfikat uniewa�nienia\n"
+msgstr "un- fa�szywy certyfikat uniewa�nienia\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
+msgstr "un? problem przy sprawdzaniu uniewa�nienia: %s\n"
 
-#: g10/keyedit.c:1837
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
 #, fuzzy
+msgid "expired"
+msgstr "data"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
+
+#: g10/keyedit.c:2207
 msgid ""
 "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"
+"Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
+"dop�ki program nie zostanie uruchomiony ponownie.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[uniewa�niony]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[przeterminowany]"
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"OSTRZE�ENIE: �aden identyfikator u�ytkownika nie zosta� oznaczony explicite\n"
+"             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
+"             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
+
+#: g10/keyedit.c:2399
 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 ""
-"OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e "
-"niekt�re \n"
-"             wersje przestan� go rozumie�.\n"
+"OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
+"             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 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"
+msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"OSTRZE�ENIE: To jest klucz PGP wersji 2.x. Wyznaczenie mu klucza\n"
+"             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
+"             go rozumie�.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Wprowad� rozmiar klucza"
+msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
+"OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N): "
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
-msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
+msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
-msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
+msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
+msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "lokalnie podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
-msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
+msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "podpisany przez %08lX w %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+"OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
+"przysz�o�ci)\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Regulamin podpisu: "
+msgstr "Krytyczny regulamin podpisu: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Adnotacje podpisu: "
+msgstr "Krytyczne adnotacje podpisu: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [wygasa :%s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr " [wygasa :%s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[uniewa�niony]"
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "lista kluczy i ich odcisk�w"
+msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "     Odcisk klucza ="
+msgstr "      Odcisk podklucza:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "     Odcisk klucza ="
+msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "     Odcisk klucza ="
+msgstr "       Odcisk podklucza:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "niepoprawne has�o, lub nieznany algorytm szyfruj�cy (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:415
-#, 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:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
-msgstr "Zaszyfrowano kluczem %s, o numerze %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "zaszyfrowane za pomoc� %lu hase�\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "zaszyfrowane jednym has�em\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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"
+msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
-"osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go przyj��\n"
+"osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Adnotacja: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Regulamin: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Wa�no�� podpisu wygas�a %s.\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                        alias \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Klucz dost�pny w: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Wa�no�� podpisu wygas�a %s.\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Wa�no�� podpisu wygasa %s.\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "podpis %s, skr�t %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binarny"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "tekstowy"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "nieznany"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Nie nale�y u�ywa� algorytm�w do�wiadczalnych!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 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:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "OSTRZE�ENIE: '%s' jest przestarza�� opcj�.\n"
+msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "OSTRZE�ENIE: '%s' jest przestarza�� opcj�.\n"
+msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "nale�y u�y� opcji \"--keyserver-options %s\"\n"
+msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Nieskompresowany"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Nieskompresowany"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "ta wiadomo�� mo�e nie da� si� odczyta� za pomoc� %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "odczyt opcji z ,,%s''\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "nieznany domy�lny adresat ,,%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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
+"bezpieczny\n"
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "nie mo�na ustawi� numeru procesu klienckiego agenta\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "serwer nie chce czyta� deskryptora dla agenta\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "serwer nie chce pisa� deskryptora dla agenta\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "z�y format zmiennej GPG_AGENT_INFO\n"
+msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
-msgstr "problem z porozumiewaniem si� z gpg-agentem\n"
+msgstr "problem z porozumiewaniem si� z agentem\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3610,293 +4035,311 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Has�o\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Has�o\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "has�o zbyt d�ugie\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "b��dna odpowied� agenta\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Podaj has�o: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 "\n"
-"Musisz poda� has�o aby odbezpieczy� klucz tajny u�ytkownika:\n"
+"Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Podaj has�o: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
+msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "adresat anonimowy; sprawdzanie %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste�my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, 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"
+msgstr "algorytm szyfruj�cy %d%s jest nieznany, lub zosta� wy��czony\n"
 
-#: g10/pubkey-enc.c:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "klucz %08lX: klucz zosta� uniewa�niony!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "zapytanie o klucz %08lX w serwerze HKP %s\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "nie mo�na pobra� klucza z serwera: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "b��d przy wysy�aniu do '%s': %s\n"
+msgstr "UWAGA: klucz zosta� uniewa�niony"
 
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "wysy�anie do '%s' powiod�o si� (status=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "wysy�anie do '%s' nie powiod�o si� (status=%u)\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "zapytanie o \"%s\" w serwerze HKP %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "nie mo�na przeszuka� serwera: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Niepoprawne has�o; prosz� spr�bowa� ponownie"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� has�o.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 "tworzenie przestarza�ej 16-bitowej sumy kontrolnej dla ochrony klucza\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
-msgstr ""
+msgstr "OSTRZE�ENIE: konflikt skr�t�w podpis�w w wiadomo�ci\n"
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:99
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "OSTRZE�ENIE: podklucz podpisuj�cy %08lX nie jest skro�nie podpisany\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk�adane\n"
-"nie zapewniaj� bezpiecze�stwa!\n"
+"OSTRZE�ENIE: podklucz podpisuj�cy %08lX jest niepoprawnie skro�nie "
+"podpisany\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "klucz publiczny %08lX jest o %lu sekund� m�odszy od podpisu\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "klucz publiczny %08lX jest o %lu sekund(y) m�odszy od podpisu\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy %08lX przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
-"przyj�to niewa�no�� podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
+"podpis z�o�ony kluczem %08lX uznany za niewa�ny z powodu nieznanego bitu "
+"krytycznego\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:532
 #, fuzzy, c-format
-msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "klucz %08lX: brak podklucza dowi�zywanego podpisem\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "nie mo�na umie�ci� adnotacji w podpisach sk�adanych kluczami PGP 2.x\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
-"OSTRZE�ENIE: nie mo�na rozkodowa� urla regulaminu, pozostanie zakodowany.\n"
+"nie mo�na umie�ci� adnotacji w podpisach kluczy sk�adanych kluczami PGP 2.x\n"
 
-#: g10/sign.c:151
+#: g10/sign.c:112
 #, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"OSTRZE�ENIE: nie mo�na rozwin�� %% w URL adnotacji (jest zbyt d�ugi).\n"
+"             U�yty zostanie nie rozwini�ty.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+"nie mo�na umie�ci� URL-a regulaminu w podpisach sk�adanych kluczami PGP 2.x\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"w podpisach dla PGP 2.x nie mo�na umie�ci� URL-a do regulaminu podpisu\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
-"OSTRZE�ENIE: nie mo�na rozkodowa� urla regulaminu, pozostanie zakodowany.\n"
+"OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
+"           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"OSTRZE�ENIE: nie mo�na rozwin�� znacznik�w %% w URL regulaminu\n"
+"           (jest zbyt d�ugi). U�yty zostanie nie rozwini�ty.\n"
+
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "%s podpis z�o�ony przez: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
+msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 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"
+msgstr ""
+"kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
+"podpis�w\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
+msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
@@ -3911,12 +4354,12 @@ msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "baza zaufania, wpis %lu: lseek() nie powiod�a si�: %s\n"
+msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
@@ -3925,198 +4368,266 @@ msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: dost�p niemo�liwy: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: nie mo�na utworzy� blokady\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: nie mo�na utworzy� blokady\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mo�na utworzy�: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "UWAGA: nie mo�na zapisywa� bazy zaufania\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "baza zaufania: procedura lseek() zawiod�a: %s\n"
+msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "baza zaufania: procedura read() (n=%d) zawiod�a: %s\n"
+msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpg --fix-trustdb\".\n"
+"Baza zaufania jest uszkodzona; prosz� uruchomi� ,,gpg --fix-trustdb''.\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "`%s' nie jest poprawnym d�ugim numerem klucza\n"
+msgstr ",,%s'' nie jest poprawnym d�ugim numerem klucza\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "klucz %08lX: zaakceptowany jako klucz zaufany\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klucz %08lX jest wpisany wi�cej ni� raz w bazie zaufania\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "klucz zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "nigdy     "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "sprawdzanie bazy jest niepotrzebne\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "sprawdzanie bazy jest niepotrzebne\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "brak absolutnie zaufanych kluczy\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
-"sprawdzanie na g��boko�ci %d podpis�w =%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
-"d)\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4126,7 +4637,7 @@ msgstr ""
 "Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
 "argumentu linii polece�.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
@@ -4140,31 +4651,30 @@ msgstr ""
 #: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "pomini�ty '%s': duplikat\n"
+msgstr "pomini�ty ,,%s'': duplikat\n"
 
 #: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
-msgstr "pomini�ty '%s': %s\n"
+msgstr "pomini�ty ,,%s'': %s\n"
 
 #: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
-msgstr "pomini�ty: klucz tajny ju� znajduje si� w bazie\n"
+msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"pomini�ty '%s': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n"
+"pomini�ty ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n"
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "Plik '%s' ju� istnieje. "
+msgstr "Plik ,,%s'' ju� istnieje. "
 
 #: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
@@ -4173,32 +4683,37 @@ msgstr "Nadpisa� (t/N)? "
 #: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
-msgstr "%s: nieznana ko�c�wka\n"
+msgstr "%s: nieznana ko�c�wka nazwy\n"
 
 #: g10/openfile.c:141
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: stworzono nowy plik ustawie�\n"
+msgstr "nowy plik ustawie� ,,%s'' zosta� utworzony\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog utworzony\n"
@@ -4207,7 +4722,7 @@ msgstr "%s: katalog utworzony\n"
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"OSTRZE�ENIE: wiadomo�� by�a szyfrowana s�abym kluczem szyfru symetrycznego.\n"
+"OSTRZE�ENIE: wiadomo�� by�a szyfrowana kluczem s�abym szyfru symetrycznego.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
@@ -4224,46 +4739,46 @@ msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 "Algorytm DSA wymaga u�ycia algorytmu skr�tu daj�cego 160-bitowy wynik.\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(chyba, �e klucz zostaje wybrany przez podanie odcisku)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Usun�� ten klucz ze zbioru? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "To jest klucz tajny! - czy na pewno go usun��? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr "informacja o zaufaniu dla w�a�ciciela klucza zosta�a wymazana\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "dla klucza publicznegi ,,%s'' jest klucz tajny!\n"
+msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4274,7 +4789,7 @@ msgstr ""
 "zaufania, i nie ma to nic wsp�lnego z tworzon� automatycznie sieci�\n"
 "certyfikat�w."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4283,92 +4798,61 @@ msgid ""
 msgstr ""
 "Aby zbudowa� Sie� Zaufania, GnuPG potrzebuje zna� klucze do kt�rych\n"
 "masz absolutne zaufanie. Zwykle s� to klucze do kt�rych masz klucze\n"
-"tajne. Odpowiedz \"tak\", je�li chcesz okre�li� ten klucz jako klucz\n"
+"tajne. Odpowiedz ,,tak'', je�li chcesz okre�li� ten klucz jako klucz\n"
 "do kt�rego masz absolutne zaufanie.\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr ""
-"Je�li mimo wszystko chcesz u�y� tego uniewa�nionego klucza, odpowiedz \"tak"
-"\"."
+"Je�li mimo wszystko chcesz u�y� tego uniewa�nionego klucza, odpowiedz ,,"
+"tak''."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Je�li mimo wszystko chcesz u�y� tego klucza, klucza, co do kt�rego nie ma\n"
-"�adnej pewno�ci do kogo nale�y, odpowiedz \"tak\"."
+"�adnej pewno�ci do kogo nale�y, odpowiedz ,,tak''."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Podaj adresat�w tej wiadomo�ci."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Wyb�r algorytmu.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (zwany te� DSS) to algorytm podpisu cyfrowego i tylko do sk�adania\n"
-"podpis�w mo�e by� u�ywany. Jest to preferowany algorytm poniewa�\n"
-"sk�adane nim podpisy sprawdza si� du�o szybciej ni� te sk�adane\n"
-"algorytmem ElGamala.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"Algorytm ElGamala mo�e by� u�ywany zar�wno do podpis�w jak i do\n"
-"szyfrowania.  Standard OpenPGP rozr�nia dwa typy tego algorytmu -\n"
-"tylko do szyfrowania, oraz do szyfrowania i podpisywania. Faktycznie\n"
-"algorytm pozostaje bez zmian ale pewne parametry musz� by� odpowiednio\n"
-"dobrane aby stworzy� klucz kt�rym mo�na sk�ada� bezpieczne\n"
-"podpisy. Ten program obs�uguje oba typy ale inne implementacje nnie\n"
-"musz� rozumie� kluczy do podpis�w i szyfrowania\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"G��wny klucz musi by� kluczem podpisuj�cym, jest to powodem dla\n"
-"kt�rego w tym menu nie ma mo�no�ci wyboru klucza ElGamala do\n"
-"szyfrowania."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Ten typ klucza jest zdefiniowany w RFC2440, jednak�e jest on odradzany\n"
-"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:98
+#: g10/helptext.c:87
 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 ""
+"U�ywanie tego samego klucza do podpisywania i szyfrowania nie jest dobrym\n"
+"pomys�em. Mo�na tak post�powa� tylko w niekt�rych zastosowaniach. Prosz� "
+"si�\n"
+"najpierw skonsultowa� z ekspertem od bezpiecze�stwa. "
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Wprowad� rozmiar klucza"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Odpowied� \"tak\" lub \"nie\"."
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4380,20 +4864,20 @@ msgstr ""
 "w�a�ciwej obs�ugi b��d�w - system pr�buje interpretowa� podan� warto��\n"
 "jako okres."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Nazwa w�a�ciciela klucza."
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "prosz� wprowadzi� opcjonalny ale wysoce doradzany adres e-mail"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Prosz� wprowadzi� opcjonalny komentarz"
 
 # OSTRZE�ENIE: nic nie zosta�o wyeksportowane!
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4407,11 +4891,11 @@ msgstr ""
 "O aby kontynuowa� tworzenie klucza.\n"
 "Q aby zrezygnowa� z tworzenia klucza."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4459,7 +4943,7 @@ msgstr ""
 "\n"
 "\"0\" oznacza, �e nie podajesz �adnych informacji na temat tego jak "
 "dog��bnie\n"
-"    sprawdzi�a�/e� to�samo�� u�ytkownika.\n"
+"    to�samo�� u�ytkownika zosta�a przez Ciebie potwierdzona.\n"
 "\n"
 "\"1\" oznacza, �e masz przekonanie, �e to�samo�� u�ytkownka odpowiada\n"
 "    identyfikatorowi klucza, ale nie by�o mo�liwo�ci sprawdzenia tego.\n"
@@ -4482,23 +4966,23 @@ msgstr ""
 "\n"
 "Je�li nie wiesz co odpowiedzie�, podaj \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
 msgstr "Odpowiedz \"tak\", aby podpisa� WSZYSTKIE identyfikatory u�ytkownika."
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
 "Aby skasowa� ten identyfikator u�ytkownika (co wi��e si� ze utrat�\n"
-"wszystkich jego po�wiadcze�!) nale�y odpowiedzie� \"tak\"."
+"wszystkich jego po�wiadcze�!) nale�y odpowiedzie� ,,tak''."
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Aby skasowa� podklucz nale�y odpowiedzie� \"tak\"."
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4508,7 +4992,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4521,13 +5005,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:225
+#: g10/helptext.c:214
 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."
+msgstr "Ten podpis jest niepoprawny. Mo�na usuni�� go ze zbioru kluczy."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4541,7 +5025,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:237
+#: g10/helptext.c:226
 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"
@@ -4551,30 +5035,30 @@ msgstr ""
 "ustawienia. Data na odpowiednich podpisach zostane przesuni�ta do przodu o\n"
 "jedn� sekund�. \n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "Podaj d�ugie, skomplikowane has�o, np ca�e zdanie.\n"
+msgstr "Podaj d�ugie, skomplikowane has�o, np. ca�e zdanie.\n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 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:264
+#: g10/helptext.c:253
 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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4601,7 +5085,7 @@ msgstr ""
 "      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by� \n"
 "      poprawny.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4611,68 +5095,671 @@ msgstr ""
 "uniewa�nienia. Opis powinien byc zwi�z�y. \n"
 "Pusta linia ko�czy wprowadzanie tekstu.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Pomoc niedost�pna"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
-msgstr "Brak pomocy o '%s'"
+msgstr "Brak pomocy o ,,%s''"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
-msgstr "zbi�r kluczy `%s' utworzony\n"
+msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
-msgstr "sprawdzanie zbioru kluczy `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "sprawdzanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu kluczy do tej chwili (%lu podpis�w)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Wybierz zdj�cie kt�re chcesz do��czy� do swojego klucza jako identyfikator.\n"
+"Musi to by� plik w formacie JPEG. Zostanie on zapisany w Twoim kluczu\n"
+"publicznym. Je�li b�dzie du�y, powi�kszy to tak�e rozmiar Twojego klucza!\n"
+"Dobry rozmiar to oko�o 240 na 288 pikseli.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Nazwa pliku ze zdj�ciem w formacie JPEG: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Nie mo�na otworzy� zdj�cia ,,%s'': %s.\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr ",,%s'' nie jest plikiem JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "nie mo�na wy�wietli� zdj�cia!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "odwo�ania do zewn�trznych program�w s� wy��czone\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"nieszczelne uprawnienia ustawie� - wo�anie zewn�trznych program�w wy��czone\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"platforma wymaga u�ycia plik�w tymczasowych do wo�ania zewn�trznych "
+"program�w\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "b��d systemu podczas wo�ania programu zewn�trznego: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "nienaturalne zako�czenie pracy zewn�trznego programu\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "nie mo�na uruchomi� zewn�trznego programu\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "nie mo�na odczyta� odpowiedzi programu zewn�trznego: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "nigdy     "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Zostanie uniewa�niony przez:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(to jest czu�y klucz uniewazniaj�cy)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "wymuszono opakowanie ASCII wyniku.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "nieznany algorytm ochrony\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Certyfikat uniewa�nienia zosta� utworzony.\n"
+"\n"
+"Nale�y przenie�� go na no�nik kt�ry mo�na bezpiecznie ukry�; je�li �li "
+"ludzie\n"
+"dostan� ten certyfikat w swoje r�ce, mog� u�y� go do uczynienia klucza\n"
+"nieu�ytecznym.\n"
+"\n"
+"Niez�ym pomys�em jest wydrukowanie certyfikatu uniewa�nienia i schowanie\n"
+"wydruku w bezpiecznym miejscu, na wypadek gdyby no�nik z certyfikatem sta� "
+"si�\n"
+"nieczytelny. Ale nale�y zachowa� ostro�no��, systemy drukowania r�nych\n"
+"komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
+"nieupowa�nionym.\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Pow�d uniewa�nienia: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(nie podano)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Informacje poprawne? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Lista przypisanych warto�ci zaufania, stworzona %s\n"
+"# (u�yj \"gpg --import-ownertrust\" aby j� wczyta�)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "nie mo�na otworzy� pliku: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "linia zbyt d�uga\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "b��d: brak dwukropka\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "b��d: niew�a�ciwy odcisk klucza\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "b��d: brak warto��i zaufania w�a�ciciela\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "b��d podczas odczytu zapisu warto�ci zaufania: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "b��d odczytu: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "OSTRZE�ENIE: algorytm skr�tu ,,%s'' nie jest cz�ci� standardu OpenPGP.\n"
+#~ "             U�ywasz go na w�asn� odpowiedzialno��!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[pliki]|szyfrowanie plik�w"
+
+#~ msgid "store only"
+#~ msgstr "zapis danych w formacie OpenPGP"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[pliki]|odszyfrowywanie plik�w"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr ""
+#~ "z�o�enie na kluczu podpisu nie podlegaj�cego \n"
+#~ "uniewa�nieniu"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr ""
+#~ "z�o�enie na kluczu podpisu prywatnego,\n"
+#~ "nie podlegaj�cego uniewa�nieniu"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "wypisane sekwencji pakiet�w"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "eksport warto�ci zaufania"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "wczytanie warto��i zaufania"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "bezobs�ugowe uaktualnienie bazy zaufania"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "naprawa uszkodzonej bazy zaufania"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "zdj�cie opakowania ASCII pliku lub potoku"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "opakowanie ASCII pliku lub potoku"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "domy�lny klucz jest domy�lnym adresatem"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "bez odwo�a� do terminala"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "wymuszenie trzeciej wersji formatu podpis�w"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "bez wymuszania trzeciej wersji formatu podpis�w"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "wymuszenie czwartej wersji formatu podpis�w"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "bez wymuszania czwartej wersji formatu podpis�w"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "do szyfrowania b�dzie u�ywany MDC"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "do szyfrowania nie zostanie u�yty MDC"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "wykorzystanie agenta zarz�dzania has�ami"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "tryb wsadowy: �adnych pyta�"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "dodanie zbioru kluczy do u�ywanych"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "dodanie zbioru kluczy tajnych do u�ywanych"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NAZWA|ustawienie NAZWA jako domy�lnego klucza prywatnego"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAZWA| strona kodowa wy�wietlanego tekstu"
+
+#~ msgid "read options from file"
+#~ msgstr "wczytanie opcji z pliku"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[plik]|pisanie opisu stanu do pliku"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KLUCZ|ustawienie klucza jako ca�kowicie zaufanego"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emulacja trybu opisanego w RFC1991"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|N-ty tryb obliczania has�a"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|ALG|wymuszenie algorytmu skr�tu has�a ALG"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|ALG|wymuszenie algorytmu szyfruj�cego ALG dla has�a"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NAZWA|wymuszenie algorytmu szyfruj�cego NAZWA"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NAZWA|wymuszenie algorytmu skr�tu  NAZWA"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|wymuszenie algorytmu kompresji N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "usuni�cie numer�w kluczy adresat�w z szyfrogram�w"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "okazywanie zdj�cia - identyfikatora u�ytkownika"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "bez pokazywania zdj��"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "polecenie wywo�uj�ce przegl�dark� do zdj��"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "w tej wersji kompresja ,,%s'' jest tylko do odczytu\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "ustawienie kompresji musi pochodzi� z zakresu %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Nie ma pewne, do do kogo nale�y ten klucz, ale jest akceptowalny.\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "ustawienie %c%lu jest niepoprawne\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "UWAGA: Wykryto klucz g��wny algorytmu ElGamala. Jego import potrwa jaki� "
+#~ "czas.\n"
+
+#~ msgid " (default)"
+#~ msgstr "(domy�lnie)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  utworzony: %s, wygasa: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Adnotacja: "
+
+#~ msgid "Policy: "
+#~ msgstr "Regulamin: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "zapytanie o klucz %08lX w %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "nie mo�na pobra� klucza z serwera: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "b��d przy wysy�aniu do ,,%s'': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ 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"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "ten serwer kluczy nie umo�liwia przeszukiwania\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "nie mo�na przeszuka� serwera: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "klucz %08lX: Klucz algorytmu ElGamala wygenerowany przez PGP \n"
+#~ "              - podpisy nim sk�adane nie zapewniaj� bezpiecze�stwa!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "klucz %08lX zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
+#~ "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "klucz %08lX zosta� stworzony %lu sekund(y) w przysz�o�ci (zaburzenia\n"
+#~ "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "klucz %08lX zosta� oznaczony jako obdarzony absolutnym zaufaniem\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr ""
+#~ "podpis kluczem podpisuj�cym ElGamala %08lX na %08lX zosta� pomini�ty\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr ""
+#~ "podpis kluczem %08lX na kluczu podpisuj�cym ElGamala %08lX zosta� "
+#~ "pomini�ty\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "sprawdzanie na g��boko�ci %d podpis�w =%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
+#~ "d)\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Wyb�r algorytmu.\n"
+#~ "\n"
+#~ "DSA (zwany te� DSS) to algorytm podpisu cyfrowego i tylko do sk�adania\n"
+#~ "podpis�w mo�e by� u�ywany. Jest to algorytm preferowany, gdy�\n"
+#~ "sk�adane nim podpisy sprawdza si� du�o szybciej ni� te sk�adane\n"
+#~ "algorytmem ElGamala.\n"
+#~ "\n"
+#~ "Algorytm ElGamala mo�e by� u�ywany zar�wno do podpis�w jak i do "
+#~ "szyfrowania.\n"
+#~ "Standard OpenPGP rozr�nia dwa typy tego algorytmu - tylko do "
+#~ "szyfrowania,\n"
+#~ "oraz do szyfrowania i podpisywania. Algorytm pozostaje bez zmian ale "
+#~ "pewne\n"
+#~ "parametry musz� by� odpowiednio dobrane aby stworzy� klucz kt�rym mo�na\n"
+#~ "sk�ada� bezpieczne podpisy. Ten program obs�uguje oba typy ale inne\n"
+#~ "implementacje nnie musz� rozumie� kluczy do podpis�w i szyfrowania\n"
+#~ "\n"
+#~ "G��wny klucz musi by� kluczem podpisuj�cym, jest to powodem dla\n"
+#~ "kt�rego w tym menu nie ma mo�no�ci wyboru klucza ElGamala do\n"
+#~ "szyfrowania."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Ten typ klucza jest zdefiniowany w RFC2440, jednak�e jest on odradzany, "
+#~ "gdy�\n"
+#~ "nie jest obs�ugiwany przez wszystkie programy zgodne z OpenPGP, a podpisy "
+#~ "nim\n"
+#~ "sk�adane s� du�e i ich sprawdzanie trwa d�ugo."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu kluczy do tej chwili (%lu podpis�w)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "klucz jest niekompletny\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "klucz %08lX nie jest kompletny\n"
+
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "wyj�cie"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr ""
+#~ "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "Ten algorytm szyfruj�cy jest u�ywany tylko przez GnuPG. Tego klucza nie "
+#~ "b�dzie\n"
+#~ "mo�na u�y� do ��czno�ci z u�ytkownikami PGP. Wybrany algorytm jest tak�e\n"
+#~ "bardzo powolny, oraz mo�e nie by� tak bezpieczny jak pozosta�e dost�pne.\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "Stworzy� klucz pomimo to? "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "odnaleziono odwo�anie do niepoprawnego szyfru (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "serwer kluczy nie jest w pe�ni zgodny z HKP\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr "U�ywanie tego algorytmu jest odradzane - tworzy� mimo to? "
+
 #, fuzzy
 #~ msgid ""
 #~ "you have to start GnuPG again, so it can read the new configuration file\n"
@@ -4850,9 +5937,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "b��d odczytu g��wnego klucza dla LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: funkcja search_record zawiod�a: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "klucz %08lX: wyszukanie zapisu nie powiod�o si�\n"
 
@@ -4865,9 +5949,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "wyliczenie kluczy tajnych nie powiod�o si� %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "klucz %08lX.%lu Dobre dowi�zanie podklucza\n"
 
@@ -4927,9 +6008,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "lid %lu: inserted\n"
 #~ msgstr "lid %lu: wpisany\n"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "b��d podczas odczytu wpisu katalogowego: %s\n"
-
 #~ msgid "\t%lu keys inserted\n"
 #~ msgstr "\t%lu kluczy wpisanych\n"
 
@@ -5010,9 +6088,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "do not write comment packets"
 #~ msgstr "nie zapisywa� pakiet�w z komentarzem"
 
-#~ msgid "(default is 1)"
-#~ msgstr "(domy�lnie 1)"
-
 #~ msgid "(default is 3)"
 #~ msgstr "(domy�lnie 3)"
 
@@ -5075,9 +6150,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 #~ msgstr "lista domy�lna %lu[%d] z %lu nie wskazuje na wpis katalogowy\n"
 
-#~ msgid "lid %lu does not have a key\n"
-#~ msgstr "lid %lu nie ma klucza\n"
-
 #~ msgid "lid %lu: can't get keyblock: %s\n"
 #~ msgstr "lid %lu: pobranie bloku klucza niemo�liwe: %s\n"
 
@@ -5192,9 +6264,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "keygen.email"
 #~ msgstr "Adres e-mail (opcjonalny ale warto go wpisa�)"
 
-#~ msgid "keygen.comment"
-#~ msgstr "Komentarz (opcjonalny)"
-
 #~ msgid "keygen.userid.cmd"
 #~ msgstr ""
 #~ "I  - zmiana imienia lub nazwiska.\n"
@@ -5252,12 +6321,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "openfile.overwrite.okay"
 #~ msgstr "Odpowiedz \"tak\" je�li na pewno chcesz nadpisa� ten plik"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "nie mo�na otworzy� pliku: %s\n"
-
-#~ msgid "read error: %s\n"
-#~ msgstr "b��d odczytu: %s\n"
-
 #~ msgid "writing keyblock\n"
 #~ msgstr "zapisuj� blok klucza\n"
 
@@ -5273,13 +6336,6 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "Usage: gpgm [options] [files] (-h for help)"
 #~ msgstr "Wywo�anie: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#~ msgid ""
-#~ "Syntax: gpgm [options] [files]\n"
-#~ "GnuPG maintenance utility\n"
-#~ msgstr ""
-#~ "Sk�adnia: gpgm [opcje] [pliki]\n"
-#~ "GnuPG program obs�uguj�cy\n"
-
 #~ msgid "usage: gpgm [options] "
 #~ msgstr "spos�b u�ycia: gpgm [opcje]"
 
@@ -5307,25 +6363,9 @@ msgstr "%s: zbi�r kluczy utworzony\n"
 #~ msgid "user '%s' not in trustdb\n"
 #~ msgstr "brak u�ytkownika '%s' w bazie zaufania\n"
 
-#~ msgid ""
-#~ "# List of assigned trustvalues, created %s\n"
-#~ "# (Use \"gpgm --import-ownertrust\" to restore them)\n"
-#~ msgstr ""
-#~ "# Lista przypisanych warto�ci zaufania, stworzona %s\n"
-#~ "# (u�yj \"gpgm --import-ownertrust\" aby j� przywr�ci�)\n"
-
 #~ msgid "directory record w/o primary key\n"
 #~ msgstr "wpis katalogowy bez klucza g��wnego\n"
 
-#~ msgid "error: missing colon\n"
-#~ msgstr "b��d: brak dwukropka\n"
-
-#~ msgid "error: invalid fingerprint\n"
-#~ msgstr "b��d: niew�a�ciwy odcisk klucza\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "b��d: brak warto��i zaufania w�a�ciciela\n"
-
 #~ msgid "key not in trustdb, searching ring.\n"
 #~ msgstr "brak klucza w bazie zaufania, przeszukiwany jest zbi�r kluczy\n"
 
diff --git a/po/pt.po b/po/pt.po
index ab2cab474..a125a4efc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,55 +8,73 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-03-05 16:05+0000\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "Aviso: a utilizar mem�ria insegura!\n"
+msgstr "AVISO: a utilizar mem�ria insegura!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "por favor veja http://www.gnupg.org/faq.html para mais informa��es\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
+#, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "erro geral"
@@ -253,7 +271,6 @@ msgstr "n�o cifrado"
 msgid "not processed"
 msgstr "n�o processado"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
 msgstr "chave p�blica n�o utiliz�vel"
@@ -266,74 +283,81 @@ msgstr "chave secreta n�o utiliz�vel"
 msgid "keyserver error"
 msgstr "erro do servidor de chaves"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � um bug (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel 'stat' a `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed est� vazia\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
-"aviso: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
+"AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel ler `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel escrever `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -358,7 +382,29 @@ 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:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+
+#: cipher/primegen.c:120
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr ""
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -366,163 +412,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[ficheiros]|cifrar ficheiros"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "apenas armazenar"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[ficheiros]|decifrar ficheiros"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "assinar uma chave de forma n�o revoc�vel"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "assinar uma chave localmente e de forma n�o revoc�vel"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "listar apenas as sequ�ncias de pacotes"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "exportar os valores de confian�a"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importar os valores de confian�a"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "actualizar automaticamente a base de dados de confian�a"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "consertar uma base de dados de confian�a"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "retirar armadura de um ficheiro ou do \"stdin\""
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "criar armadura para um ficheiro ou \"stdin\""
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,213 +543,59 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "ser mais silencioso"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "nunca usar o terminal"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "for�ar assinaturas v3"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "n�o for�ar assinaturas v3"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "for�ar assinaturas v4"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "n�o for�ar assinaturas v4"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "sempre usar um MDC para cifrar"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "nunca usar um MDC para cifrar"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "utilizar o gpg-agent"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "modo n�o-interactivo: nunca perguntar"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "assumir sim para a maioria das perguntas"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "assumir n�o para a maioria das perguntas"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr ""
-"adicionar este porta-chaves\n"
-"� lista de porta-chaves"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "adicionar este porta-chaves secreto � lista"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "mostrar em que porta-chave a chave est�"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+msgstr "perguntar antes de sobrep�r"
 
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|ENDERE�O|usar este servidor para buscar chaves"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr ""
-"|NOME|definir mapa de caracteres do terminal como\n"
-"NOME"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "ler op��es do ficheiro"
-
-#: g10/g10.c:425
-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:427
-msgid "|[file]|write status info to file"
-msgstr "|[ficheiro]|escrever ifnroam��es de estado para o ficheiro"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|KEYID|confiar totalmente nesta chave"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emular o modo descrito no RFC1991"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"configurar todas as op��es de pacote, cifragem e \"digest\"\n"
-"para comportamento OpenPGP"
 
-#: g10/g10.c:443
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
-"configurar todas as op��es de pacote, cifragem e \"digest\"\n"
-"para comportamento PGP 2.x"
 
-#: g10/g10.c:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|usar mode de frase secreta N"
-
-#: g10/g10.c:451
-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:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
-"|NOME|usar algoritmo de criptografia NOME para\n"
-"frases secretas"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|usar algoritmo de compress�o N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "eliminar campo keyid dos pacotes cifrados"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Mostrar IDs Fotogr�ficos"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "N�o mostrar IDs Fotogr�ficos"
-
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "Configurar linha de comandos para ver fotografias"
-
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -746,7 +603,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -766,15 +623,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -784,7 +641,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -792,447 +649,656 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Chave p�blica: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Cifra: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Dispers�o: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Compress�o: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:1172
 #, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "Aviso: dono pouco seguro em %s \"%s\"\n"
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:986
+#: g10/g10.c:1178
 #, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "Aviso: permiss�es pouco seguras em %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1181
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "Aviso: dono pouco seguro em %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1184
 #, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "Aviso: permiss�es pouco seguras em %s \"%s\"\n"
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1190
 #, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "criado um novo ficheiro de configura��o `%s'\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
+msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, 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:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTA: %s n�o � para uso normal!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
+"a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
+"inseguras\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, 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:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "AVISO: `%s' � um ficheiro vazio\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "op��es de exporta��o inv�lidas\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: op��es de importa��o inv�lidas\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "armadura inv�lida"
+msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "AVISO: `%s' � um ficheiro vazio\n"
+msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "porta-chaves inv�lido"
+msgstr "op��es de exporta��o inv�lidas\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: op��es de importa��o inv�lidas\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "op��es de importa��o inv�lidas\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr ""
+msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTA: %s n�o � para uso normal!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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:1737
+#: g10/g10.c:2441
 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:1743
+#: g10/g10.c:2447
 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:1756
+#: g10/g10.c:2460
 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:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "esta mensagem poder� n�o ser utiliz�vel pelo PGP 2.x\n"
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
-msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
+msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
-msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
+msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:1845
-#, 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:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-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:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 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:2572
 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:1858
+#: g10/g10.c:2576
 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:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "prefer�ncias inv�lidas\n"
+msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "prefer�ncias inv�lidas\n"
+msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "prefer�ncias inv�lidas\n"
+msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "prefer�ncias inv�lidas\n"
+msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
+
+#: g10/g10.c:2633
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2680
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/g10.c:2685
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/g10.c:2690
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/g10.c:2778
 #, 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:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [nome_do_ficheiro]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [nome_do_ficheiro]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:3096
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:3098
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:3109
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:3119
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "actualiza��o da chave secreta falhou: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "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"
+"um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
+"terminar com um '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+
+#: g10/g10.c:3678
 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:2737
+#: g10/g10.c:3712
 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:2739
+#: g10/g10.c:3714
 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
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "ser mais silencioso"
+
+#: g10/gpgv.c:68
+#, fuzzy
+msgid "take the keys from this keyring"
+msgstr "Remover esta chave do porta-chaves?"
+
+#: g10/gpgv.c:70
+#, fuzzy
+msgid "make timestamp conflicts only a warning"
+msgstr "conflito de \"timestamp\""
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr ""
+"|DF|escrever informa��es de estado para o\n"
+"descritor de ficheiro DF"
+
+#: g10/gpgv.c:95
+#, fuzzy
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "A chave foi substitu�da"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "A chave j� n�o � utilizada"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador j� n�o � v�lido"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "Motivo da revoca��o: "
+msgstr "motivo da revoca��o: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "Coment�rio da revoca��o: "
+msgstr "coment�rio da revoca��o: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenhum valor de confian�a designado para:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                   ou \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                   ou \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1244,188 +1310,211 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = N�o sei\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = Eu N�O confio\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Confio de forma total\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr " s = saltar esta chave\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Decis�o? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Tem a certeza que quer confiar totalmente nesta chave?"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave expirou\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
 "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: N�o se tem certeza de que esta chave realmente pertence ao dono,\n"
-"mas � aceite de qualquer modo\n"
+"%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence-nos\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"N�o se tem certeza de que esta chave pertence ao seu dono.\n"
+"N�O se tem certeza de que esta chave pertence ao seu dono.\n"
 "Se voc� *realmente* sabe o que est� a fazer, pode responder\n"
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: A utilizar uma chave que n�o � de confian�a!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
+"presente.\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -1433,131 +1522,126 @@ msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 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:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: 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:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:216
 #, fuzzy
-msgid "invalid character in preference string\n"
-msgstr "caracter inv�lido na cadeia de caract�res\n"
+msgid "too many digest preferences\n"
+msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:218
 #, fuzzy
+msgid "too many compression preferences\n"
+msgstr "demasiadas prefer�ncias `%c'\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "escrevendo auto-assinatura\n"
+msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
-msgstr "escrevendo auto-assinatura\n"
+msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
-msgstr "escrevendo assinatura ligada a uma chave\n"
+msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
+msgstr "   (%d) RSA (assinatura e cifragem)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1570,36 +1654,28 @@ msgstr ""
 "         tamanho por omiss�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1607,11 +1683,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:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1619,17 +1695,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1645,7 +1721,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1661,30 +1737,29 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1692,11 +1767,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1713,44 +1788,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 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:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1761,29 +1836,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1791,16 +1866,16 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1812,7 +1887,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1824,53 +1899,59 @@ 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:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#, fuzzy
+msgid "sorry, can't do this in batch mode\n"
+msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, 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:2211
+#: g10/keygen.c:2571
 #, 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:2225
+#: g10/keygen.c:2589
 #, 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:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "chave marcada como de confian�a absoluta\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1878,12 +1959,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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1891,7 +1972,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1899,549 +1980,636 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
+
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "assinatura falhou: %s\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, 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:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Este comando n�o � permitido no modo %s.\n"
+msgstr ""
+"ao for�ar o algoritmo de compress�o %s (%d) viola as prefer�ncias do "
+"destinat�rio\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s cifrado para: %s\n"
+msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1614
 #, 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"
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "              importados: %lu"
+msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Assinou estes identificadores de utilizadores:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:597
+#: g10/import.c:707
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:612
+#: g10/import.c:722
 #, fuzzy, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:619
-#, c-format
-msgid "key %08lX: no valid user IDs\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 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:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "chave %08lX: chave p�blica importada\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "chave %8lX: 1 novo ID de utilizador\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "chave %08lX: %d novos IDs de utilizadores\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "chave %08lX: 1 nova assinatura\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "chave %08lX: %d novas assinaturas\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "chave %08lX: 1 nova subchave\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "chave %08lX: %d novas subchaves\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:774
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "chave %08lX: n�o modificada\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:844
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
+
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "chave %08lX: certificado de revoga��o importado\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1030
+#: g10/import.c:1299
 #, 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"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr ""
+"chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1032
+#: g10/import.c:1301
 #, fuzzy, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "chave %08lX: auto-assinatura inv�lida\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "chave %08lX: liga��o de subchave inv�lida\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "chave %08lX: liga��o de subchave inv�lida\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "chave %08lX: liga��o de subchave inv�lida\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
+"AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
+"08lX\n"
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
+"AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
+"presente.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "chave %08lX: certificado de revoga��o adicionado\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 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:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 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:233
+#: g10/keyedit.c:251
 #, 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:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Confio moderadamente\n"
+
+#: g10/keyedit.c:315
 #, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Confio plenamente\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "Identificador do utilizador \"%s\" est� revocado.\n"
+msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 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) "
+msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
-msgstr ""
+msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:380
+#: g10/keyedit.c:519
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "AVISO: `%s' � um ficheiro vazio\n"
+msgid "User ID \"%s\" is expired."
+msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:545
 #, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
+
+#: g10/keyedit.c:584
+#, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
+"A sua auto-assinatura em \"%s\"\n"
+"� uma assinatura do tipo PGP 2.x.\n"
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
+
+#: g10/keyedit.c:607
+#, fuzzy, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:611
 #, fuzzy
-msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "Quer promov�-la a uma assinatura export�vel? "
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2450,51 +2618,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "Quer promov�-la a uma assinatura export�vel? "
+msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:657
 #, fuzzy, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "\"%s\" j� foi %sassinado pela chave %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:660
 #, fuzzy, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "\"%s\" j� foi %sassinado pela chave %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+#, fuzzy
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 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:535
-#, fuzzy
+#: g10/keyedit.c:759
 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"
+msgstr ""
+"N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:537
-#, fuzzy
+#: g10/keyedit.c:761
 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"
+msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2504,27 +2676,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr ""
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2532,32 +2708,31 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "isto pode ser causado por falta de auto-assinatura\n"
+msgstr ""
+"\n"
+"Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 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"
+"AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 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"
+"AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2565,7 +2740,7 @@ msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2573,7 +2748,7 @@ msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2581,7 +2756,7 @@ msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2589,7 +2764,7 @@ msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2597,33 +2772,34 @@ msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 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:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2631,7 +2807,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2639,469 +2815,569 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 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:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "fazer uma assinatura separada"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
 msgstr "assina a chave de forma n�o-revog�vel"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
 msgstr "assinar a chave localmente e de forma n�o revog�vel"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "addkey"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "adiciona nova chave secund�ria"
+msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
 msgstr "prefer�ncias actualizadas"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "erro do servidor de chaves"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "n�o consegui processar a URI do servidor de chaves\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "revocar um ID de utilizador"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, 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:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1134
-#, fuzzy
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
-msgstr "A chave est� revogada.\n"
+msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, 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:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 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:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Realmente revocar este ID de utilizador? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "configurar lista de prefer�ncias"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "'Digest': "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Caracter�sticas: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
 msgid "This key may be revoked by %s key "
-msgstr "Esta chave pode ser revogada pela chave %s %s%s\n"
+msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr " (sens�vel)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "revkey"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr "[expira: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr "[expira: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��o falsa encontrada\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao verificar revoga��o: %s\n"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
+"N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
+"correcta a n�o ser que reinicie o programa.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+#, fuzzy
+msgid "[revoked] "
+msgstr "revkey"
+
+#: g10/keyedit.c:2274
+#, fuzzy
+msgid "[expired] "
+msgstr "expire"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2399
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3110,482 +3386,624 @@ 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:2006
-#, fuzzy
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 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) "
+msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 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:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
+"       algumas vers�o do PGP podem rejeit�-la.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
+
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Insira o tamanho da chave"
+msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
+msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
+
+#: g10/keyedit.c:2782
+#, fuzzy
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+#, fuzzy
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 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:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "chave %08lX: auto-assinatura inv�lida\n"
+msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
-"assinado com sua chave %08lX em %s\n"
+"assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2918
+#: g10/keyedit.c:3499
 #, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
-"assinado com sua chave %08lX em %s\n"
+"assinada localmente com a sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2923
-#, fuzzy, c-format
+#: g10/keyedit.c:3504
+#, c-format
 msgid "This signature expired on %s.\n"
-msgstr "Esta chave vai expirar em %s.\n"
+msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:2927
-#, fuzzy
+#: g10/keyedit.c:3508
 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) "
+msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:2931
-#, fuzzy
+#: g10/keyedit.c:3512
 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:2975
+#: g10/keyedit.c:3558
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s%s\n"
-msgstr "   assinado por %08lX em %s%s\n"
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
-msgstr ""
+msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3022
-#, fuzzy
+#: g10/keyedit.c:3606
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
+msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
+"AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr ""
+"A mostrar a fotografia %s com o tamanho %ld da chave 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
-msgstr "Politica de assinatura: "
+msgstr "Politica de assinatura cr�tica: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
-msgstr "Nota��o da assinatura: "
+msgstr "Nota��o de assinatura cr�tica: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
-msgstr "Nota��o da assinatura: "
+msgstr "Nota��o de assinatura: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
-msgstr "n�o � leg�vel por humanos"
+msgstr "n�o leg�vel por humanos"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr "[expira: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr "[expira: %s]"
 
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "revkey"
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
-msgstr "listar as chaves e as impress�es digitais"
+msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "  Impress�o da chave ="
+msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
-msgstr "  Impress�o da chave ="
+msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "  Impress�o da chave ="
+msgstr "      Impress�o da subchave:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:258
+#: g10/mainproc.c:262
 #, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "algoritmo de dispers�o inv�lido `%s'\n"
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "algoritmo de criptografia desconhecido"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "cifrado com algoritmo desconhecido %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "Repita a frase secreta\n"
+
+#: g10/mainproc.c:502
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "Repita a frase secreta\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Nota��o: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Pol�tica: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Esta assinatura expirou em %s.\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                   ou \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+#, fuzzy
+msgid "Key available at: "
+msgstr "Nenhuma ajuda dispon�vel"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, fuzzy, c-format
+msgid "Signature expired %s\n"
+msgstr "Esta assinatura expirou em %s.\n"
+
+#: g10/mainproc.c:1643
+#, fuzzy, c-format
+msgid "Signature expires %s\n"
+msgstr "Esta assinatura expirou em %s.\n"
+
+#: g10/mainproc.c:1646
+#, fuzzy, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
+#: g10/mainproc.c:1647
+#, fuzzy
+msgid "binary"
+msgstr "primary"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr ""
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+#, fuzzy
+msgid "unknown"
+msgstr "vers�o desconhecida"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais n�o devem ser usados!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia est� desctualizado; por favor use um "
 "algoritmo mais standard!x\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 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/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "AVISO: `%s' � um ficheiro vazio\n"
+msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVISO: `%s' � um ficheiro vazio\n"
+msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr ""
+msgstr "por favor utilize \"%s%s\" em vez dela\n"
+
+#: g10/misc.c:508
+#, fuzzy
+msgid "Uncompressed"
+msgstr "n�o processado"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "n�o processado"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "a ler op��es de `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
 #: 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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "n�o consegui colocar o pid do cliente no agente\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr "n�o consigo obter FD de leitura no servidor para o agente\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr "n�o consigo obter FD de escrita no servidor para o agente\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3598,32 +4016,40 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Insira a frase secreta\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Insira a frase secreta\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Digite a frase secreta: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3633,256 +4059,265 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Digite a frase secreta: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, 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:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "chave %08lX: a chave foi revogada!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "a pedir chave %08lX do servidor de chaves HKP %s\n"
+msgstr "NOTA: a chave foi revogada"
 
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "n�o consigo obter chave do servidor: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "erro ao enviar para `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "erro ao enviar para `%s': estado=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "a procurar por \"%s\" no servidor HKP %s\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "n�o consigo procurar no servidor de chaves: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
+
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
+"a gerar a 'checksum' (depreciada) de 16-bit para protec��o da chave secreta\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
+msgstr "AVISO: conflito no 'digest' de assinatura da mensagem\n"
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
 
-#: g10/sig-check.c:215
+#: g10/sig-check.c:102
 #, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
-msgstr ""
-"esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "a chave p�blica %08lX � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"assumindo assinatura incorrecta na chave %08lX devido a um bit cr�tico "
+"desconhecido\n"
+
+#: g10/sig-check.c:532
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "assumindo assinatura incorrecta devido a um bit cr�tico desconhecido\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:558
 #, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+
+#: g10/sign.c:85
+#, fuzzy
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
+#: g10/sign.c:93
+#, fuzzy
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
+#: g10/sign.c:112
+#, 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).  A "
+"utilizar n�o expandida.\n"
+
+#: g10/sign.c:138
+#, fuzzy
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (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
+#: g10/sign.c:187
+#, fuzzy, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand preferred keyserver URL (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:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "assinatura %s de: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
 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"
+msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, 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"
+msgstr ""
+"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
+"destinat�rio\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
@@ -3897,12 +4332,12 @@ msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
@@ -3911,200 +4346,270 @@ msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de base de dados de confian�a muito grande\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: imposs�vel aceder: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: imposs�vel criar tranca\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: imposs�vel criar tranca\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de vers�o: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confian�a inv�lida criada\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n�o � um identificador longo de chave v�lido\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceite como chave de confian�a\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confian�a\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
 "\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "chave marcada como de confian�a absoluta\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+msgid "never"
+msgstr ""
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "chave p�blica %08lX n�o encontrada: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "chave p�blica %08lX n�o encontrada: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr ""
 
-#: g10/trustdb.c:1515
-#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+#: g10/trustdb.c:1911
+#, fuzzy
+msgid "no ultimately trusted keys found\n"
+msgstr ""
+"chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
-"a verificar � profundidade %d assinado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4114,7 +4619,7 @@ msgstr ""
 "N�o se esque�a que o ficheiro com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro a ser dado na linha de comando.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
@@ -4139,15 +4644,14 @@ msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4166,26 +4670,31 @@ msgstr "%s: sufixo desconhecido\n"
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "%s: novo ficheiro de op��es criado\n"
+msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directoria criada\n"
@@ -4211,45 +4720,45 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
+msgstr "DSA necessita de utiliza��o de uma algoritmo de dispers�o de 160 bit\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(a n�o ser que escolha a chave pela sua impress�o digital)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "Esta chave � secreta! - apagar de qualquer modo? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
-msgstr ""
+msgstr "informa��es de 'ownertrust' limpas\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4259,7 +4768,7 @@ msgstr ""
 "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
 "nada a ver com a rede de certificados (implicitamente criada)."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4272,89 +4781,57 @@ msgstr ""
 "para\n"
 "que esta chave seja de confian�a absoluta.\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Se voc� quiser usar esta chave revogada assim mesmo, responda \"sim\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se voc� quiser usar esta chave, n�o de confian�a, assim mesmo, responda \"sim"
 "\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Digite o ID de utilizador do destinat�rio para quem quer enviar a\n"
 "mensagem."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Seleccione o algoritmo a ser usado.\n"
-"\n"
-"DSA (ou DSS) � o algoritmo de assinatura digital que pode ser usado apenas\n"
-"para assinaturas. Este � o algoritmo recomendado porque a verifica��o de\n"
-"assinaturas DSA � muito mais r�pida que a verifica��o de ElGamal.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"ElGamal � um algoritmo que pode ser usado para assinatura e cifragem.\n"
-"O OpenPGP distingue dois tipos deste algoritmo: um apenas para cifragem\n"
-"e outro para assinatura+cifragem; na verdade s�o iguais, mas alguns\n"
-"par�metros precisam ser escolhidos de modo especial para criar uma chave\n"
-"segura para assinatura: este programa faz isso, mas algumas outras\n"
-"implementa��es do OpenPGP n�o v�o necessariamente entender o tipo\n"
-"assinatura+cifragem.\n"
-"\n"
-"A  chave prim�ria precisa sempre ser uma chave capaz de fazer assinaturas;\n"
-"este � o motivo pelo qual a chave ElGamal apenas para cifragem n�o est�\n"
-"dispon�vel neste menu."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Apesar de estas chaves estarem definidas no RFC2440, elas n�o s�o "
-"recomendadas\n"
-"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:98
+#: g10/helptext.c:87
 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 ""
+"Em geral n�o � uma boa ideia utilizar a mesma chave para assinar e para\n"
+"cifrar.  Este algoritmo s� deve ser utilizado em alguns dom�nios.\n"
+"Por favor consulte primeiro o seu perito em seguran�a."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Insira o tamanho da chave"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4366,19 +4843,19 @@ msgstr ""
 "reac��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 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:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4392,11 +4869,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4468,11 +4945,11 @@ msgstr ""
 "\n"
 "Se n�o sabe qual � a resposta correcta, responda \"0\"."
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4480,11 +4957,11 @@ msgstr ""
 "Responda \"sim\" se quiser realmente remover este ID de utilizador.\n"
 "Todos os certificados tamb�m ser�o perdidos!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4494,7 +4971,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4506,13 +4983,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:225
+#: g10/helptext.c:214
 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:229
+#: g10/helptext.c:218
 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"
@@ -4525,8 +5002,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:237
-#, fuzzy
+#: g10/helptext.c:226
 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"
@@ -4537,23 +5013,23 @@ msgstr ""
 "O 'timestamp' de todas as auto-assinaturas afectuadas ser� avan�ado\n"
 "em um segundo.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 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:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4562,7 +5038,7 @@ msgstr ""
 "RETURN\n"
 "o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4591,7 +5067,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:286
+#: g10/helptext.c:275
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -4601,120 +5077,646 @@ msgstr ""
 "este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
 "Uma linha vazia termina o texto.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu chaves verificadas at� agora (%lu assinaturas)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr ""
+
+#: g10/photoid.c:87
+#, fuzzy, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+
+#: g10/photoid.c:97
+#, fuzzy
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
+
+#: g10/photoid.c:112
+#, fuzzy, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "%s: n�o � um base de dados de confian�a\n"
+
+#: g10/photoid.c:129
+#, fuzzy
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Est� correto (s/n)? "
+
+#: g10/photoid.c:331
+#, fuzzy
+msgid "unable to display photo ID!\n"
+msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr ""
+
+#: g10/exec.c:184
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: imposs�vel criar directoria: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+
+#: g10/exec.c:432
+#, fuzzy, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+
+#: g10/exec.c:513
+#, fuzzy, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "%s: erro ao ler registo de vers�o: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr ""
+
+#: g10/exec.c:539
+#, fuzzy
+msgid "unable to execute external program\n"
+msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+
+#: g10/exec.c:548
+#, fuzzy, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+
+#: g10/exec.c:606
+#, fuzzy, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr ""
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, fuzzy, c-format
+msgid "build_packet failed: %s\n"
+msgstr "actualiza��o falhou: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "chave %08lX: sem ID de utilizador\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr ""
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr ""
+
+#: g10/revoke.c:279 g10/revoke.c:476
+#, fuzzy
+msgid "Create a revocation certificate for this key? "
+msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr ""
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, fuzzy, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "actualiza��o da chave secreta falhou: %s\n"
+
+#: g10/revoke.c:369
+#, fuzzy
+msgid "Revocation certificate created.\n"
+msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr ""
+
+#: g10/revoke.c:429
+#, fuzzy, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "chave `%s' n�o encontrada: %s\n"
+
+#: g10/revoke.c:458
+#, fuzzy, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "a escrever chave p�blica para `%s'\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr ""
+
+#: g10/revoke.c:492
+#, fuzzy
+msgid "unknown protection algorithm\n"
+msgstr "algoritmo de compress�o desconhecido"
+
+#: g10/revoke.c:496
+#, fuzzy
+msgid "NOTE: This key is not protected!\n"
+msgstr "Esta chave n�o � protegida.\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+
+#: g10/revoke.c:588
+#, fuzzy
+msgid "Please select the reason for the revocation:\n"
+msgstr "motivo da revoca��o: "
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr ""
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr ""
+
+#: g10/revoke.c:641
+#, fuzzy
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+"\n"
+"Insira o identificador do utilizador. Termine com uma linha vazia: "
+
+#: g10/revoke.c:669
+#, fuzzy, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "motivo da revoca��o: "
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr ""
+
+#: g10/revoke.c:676
+#, fuzzy
+msgid "Is this okay? "
+msgstr "Usar esta chave de qualquer modo? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+
+#: g10/tdbdump.c:140
+#, fuzzy, c-format
+msgid "can't open file: %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: g10/tdbdump.c:151
+#, fuzzy
+msgid "line too long\n"
+msgstr "frase secreta demasiado longa\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr ""
+
+#: g10/tdbdump.c:164
+#, fuzzy
+msgid "error: invalid fingerprint\n"
+msgstr "%s: vers�o de ficheiro inv�lida %d\n"
+
+#: g10/tdbdump.c:168
+#, fuzzy
+msgid "error: no ownertrust value\n"
+msgstr "exportar os valores de confian�a"
+
+#: g10/tdbdump.c:204
+#, fuzzy, c-format
+msgid "error finding trust record: %s\n"
+msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
+
+#: g10/tdbdump.c:208
+#, fuzzy, c-format
+msgid "read error: %s\n"
+msgstr "armadura: %s\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[ficheiros]|cifrar ficheiros"
+
+#~ msgid "store only"
+#~ msgstr "apenas armazenar"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[ficheiros]|decifrar ficheiros"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "assinar uma chave de forma n�o revoc�vel"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "assinar uma chave localmente e de forma n�o revoc�vel"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "listar apenas as sequ�ncias de pacotes"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "exportar os valores de confian�a"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "importar os valores de confian�a"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "actualizar automaticamente a base de dados de confian�a"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "consertar uma base de dados de confian�a"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "retirar armadura de um ficheiro ou do \"stdin\""
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "criar armadura para um ficheiro ou \"stdin\""
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "nunca usar o terminal"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "for�ar assinaturas v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "n�o for�ar assinaturas v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "for�ar assinaturas v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "n�o for�ar assinaturas v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "sempre usar um MDC para cifrar"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "nunca usar um MDC para cifrar"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "utilizar o gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "modo n�o-interactivo: nunca perguntar"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "assumir sim para a maioria das perguntas"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "assumir n�o para a maioria das perguntas"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr ""
+#~ "adicionar este porta-chaves\n"
+#~ "� lista de porta-chaves"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "adicionar este porta-chaves secreto � lista"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "mostrar em que porta-chave a chave est�"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NOME|usar NOME como chave secreta por omiss�o"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|ENDERE�O|usar este servidor para buscar chaves"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr ""
+#~ "|NOME|definir mapa de caracteres do terminal como\n"
+#~ "NOME"
+
+#~ msgid "read options from file"
+#~ msgstr "ler op��es do ficheiro"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[ficheiro]|escrever ifnroam��es de estado para o ficheiro"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KEYID|confiar totalmente nesta chave"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emular o modo descrito no RFC1991"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|usar mode de frase secreta N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
+#~ "para frases secretas"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|NOME|usar algoritmo de criptografia NOME para\n"
+#~ "frases secretas"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NOME|usar algoritmo de criptografia NOME"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usar algoritmo de compress�o N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "eliminar campo keyid dos pacotes cifrados"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Mostrar IDs Fotogr�ficos"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "N�o mostrar IDs Fotogr�ficos"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Configurar linha de comandos para ver fotografias"
+
 #, fuzzy
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: N�o se tem certeza de que esta chave realmente pertence ao dono,\n"
+#~ "mas � aceite de qualquer modo\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "prefer�ncia %c%lu n�o � v�lida\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
+
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
-#~ msgstr "vai ter de reiniciar o GnuPG, para poder ler as novas op��es\n"
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "NOTA: Chave prim�ria Elgamal detectada - pode demorar algum tempo a "
+#~ "importar\n"
+
+#~ msgid " (default)"
+#~ msgstr " (por omiss�o)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  criada: %s expira: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Nota��o: "
+
+#~ msgid "Policy: "
+#~ msgstr "Pol�tica: "
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "a mudan�a de permiss�es de `%s' falhou: %s\n"
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "a pedir a chave %08lX de %s\n"
 
-#~ msgid "Fingerprint:"
-#~ msgstr "Impress�o digital:"
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "n�o consigo obter chave do servidor: %s\n"
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "       Impress�o digital:"
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "erro ao enviar para `%s': %s\n"
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NOME=VALOR|usar estes dados de nota��o"
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ 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"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "a procurar por \"%s\" no servidor HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "n�o consigo procurar no servidor de chaves: %s\n"
 
 #~ msgid ""
-#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
 #~ msgstr ""
-#~ "o primeiro caracter de um nome de nota��o deve ser uma letra ou um "
-#~ "sublinhado\n"
+#~ "chave: %08lX: esta � uma chave ElGamal gerada pelo PGP que N�O � segura "
+#~ "para assinaturas!\n"
 
-#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
 #~ msgstr ""
-#~ "pontos num nome de nota��o devem estar cercados por outros caracteres\n"
+#~ "a chave %08lX foi criada %lu segundo no futuro\n"
+#~ "(viagem no tempo ou problema no rel�gio)\n"
 
 #~ msgid ""
-#~ "WARNING: This key already has a photo ID.\n"
-#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
 #~ msgstr ""
-#~ "AVISO: Esta chave j� tem um identificador fotogr�fico.\n"
-#~ "       Se adicionar outro pode confundir algumas vers�o do PGP.\n"
+#~ "a chave %08lX foi criada %lu segundos no futuro\n"
+#~ "(viagem no tempo ou problema no rel�gio)\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 "key %08lX marked as ultimately trusted\n"
+#~ msgstr "chave %08lX marcada como de confian�a absoluta\n"
 
-#~ msgid "Are you sure you still want to sign it?\n"
-#~ msgstr "Voc� tem certeza de que quer assin�-la?\n"
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "a verificar � profundidade %d assinado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
+#~ "d\n"
 
-#~ msgid "  Are you sure you still want to sign it?\n"
-#~ msgstr "  Voc� tem a certeza que quer mesmo assim assin�-la?\n"
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Seleccione o algoritmo a ser usado.\n"
+#~ "\n"
+#~ "DSA (ou DSS) � o algoritmo de assinatura digital que pode ser usado "
+#~ "apenas\n"
+#~ "para assinaturas. Este � o algoritmo recomendado porque a verifica��o de\n"
+#~ "assinaturas DSA � muito mais r�pida que a verifica��o de ElGamal.\n"
+#~ "\n"
+#~ "ElGamal � um algoritmo que pode ser usado para assinatura e cifragem.\n"
+#~ "O OpenPGP distingue dois tipos deste algoritmo: um apenas para cifragem\n"
+#~ "e outro para assinatura+cifragem; na verdade s�o iguais, mas alguns\n"
+#~ "par�metros precisam ser escolhidos de modo especial para criar uma chave\n"
+#~ "segura para assinatura: este programa faz isso, mas algumas outras\n"
+#~ "implementa��es do OpenPGP n�o v�o necessariamente entender o tipo\n"
+#~ "assinatura+cifragem.\n"
+#~ "\n"
+#~ "A  chave prim�ria precisa sempre ser uma chave capaz de fazer "
+#~ "assinaturas;\n"
+#~ "este � o motivo pelo qual a chave ElGamal apenas para cifragem n�o est�\n"
+#~ "dispon�vel neste menu."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Apesar de estas chaves estarem definidas no RFC2440, elas n�o s�o "
+#~ "recomendadas\n"
+#~ "porque n�o s�o suportadas por todos os programas e assinaturas criadas "
+#~ "com\n"
+#~ "elas s�o grandes e sua verifica��o � lenta."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu chaves verificadas at� agora (%lu assinaturas)\n"
+
+#, fuzzy
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "chave %08lX: sem ID de utilizador\n"
 
 #, fuzzy
-#~ msgid "Really sign? (y/N) "
-#~ msgstr "Realmente assinar? "
+#~ msgid "quit|quit"
+#~ msgstr "sair"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "A utiliza��o deste algoritmo s� � suportada pelo GnuPG.  N�o poder� "
+#~ "utilizar\n"
+#~ "esta chave para comunicar com utilizadores do PGP.  Este algoritmo � "
+#~ "para\n"
+#~ "al�m disto muito lento, e pode n�o ser t�o seguro como as outras op��es.\n"
 
-#~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "chave %08lX: a nossa c�pia n�o tem auto-assinatura\n"
+#~ msgid "Create anyway? "
+#~ msgstr "Criar mesmo assim?"
 
-#~ msgid "Do you really need such a large keysize? "
-#~ msgstr "Voc� precisa realmente de uma chave t�o grande? "
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "algoritmo de 'symkey' inv�lido detectado (%d)\n"
 
-#~ msgid "   signed by %08lX at %s\n"
-#~ msgstr "   assinado por %08lX em %s\n"
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "o servidor de chaves n�o � totalmente compat�vel com HKP\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a97f9018a..64868044a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,10 +7,13 @@
 # Rafael Caetano dos Santos <[email protected]> used to be 
 # the last translator but he can't continue his work.
 #
+# Designated-Translator: none
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -18,48 +21,66 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
+#: util/secmem.c:90
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Aviso: usando mem�ria insegura!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
+#, fuzzy
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "qQ"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "erro geral"
@@ -257,7 +278,6 @@ msgstr "n�o criptografado"
 msgid "not processed"
 msgstr "n�o processado(s)"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 #, fuzzy
 msgid "unusable public key"
@@ -273,73 +293,81 @@ msgstr "chave secreta incorreta"
 msgid "keyserver error"
 msgstr "erro geral"
 
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � um bug (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:401
+#: cipher/random.c:407
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -365,7 +393,29 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+
+#: cipher/primegen.c:120
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr ""
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -373,175 +423,134 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr ""
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "apenas armazenar"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr ""
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:332
-#, fuzzy
-msgid "sign a key non-revocably"
-msgstr "assinar uma chave localmente"
-
-#: g10/g10.c:333
-#, fuzzy
-msgid "sign a key locally and non-revocably"
-msgstr "assinar uma chave localmente"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "listar apenas as seq��ncias de pacotes"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-# ownertrust ???
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "exportar os valores de confian�a"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importar os valores de confian�a"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:357
-#, fuzzy
-msgid "unattended trust database update"
-msgstr "atualizar o banco de dados de confiabilidade"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr ""
-"consertar um banco de dados de confiabilidade\n"
-"danificado"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "retirar a armadura de um arquivo ou de \"stdin\""
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "criar armadura para um arquivo ou \"stdin\""
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -551,229 +560,65 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NOME|usar NOME como destinat�rio padr�o"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "usar a chave padr�o como destinat�rio padr�o"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "ser mais silencioso"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "nunca usar o terminal"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "for�ar assinaturas v3"
-
-#: g10/g10.c:397
-#, fuzzy
-msgid "do not force v3 signatures"
-msgstr "for�ar assinaturas v3"
-
-#: g10/g10.c:398
-#, fuzzy
-msgid "force v4 key signatures"
-msgstr "for�ar assinaturas v3"
-
-#: g10/g10.c:399
-#, fuzzy
-msgid "do not force v4 key signatures"
-msgstr "for�ar assinaturas v3"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "sempre usar um MDC para criptografar"
-
-#: g10/g10.c:402
-#, fuzzy
-msgid "never use a MDC for encryption"
-msgstr "sempre usar um MDC para criptografar"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr ""
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "modo n�o-interativo: nunca perguntar"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "assumir sim para a maioria das perguntas"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "assumir n�o para a maioria das perguntas"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "adicionar este chaveiro � lista de chaveiros"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "adicionar este chaveiro secreto � lista"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr ""
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOME|usar NOME como chave secreta padr�o"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|ENDERE�O|usar este servidor para buscar chaves"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"|NOME|definir mapa de caracteres do terminal como\n"
-"NOME"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
-"|DA|escrever informa��es de estado para o\n"
-"descritor de arquivo DA"
 
-#: g10/g10.c:427
-#, fuzzy
-msgid "|[file]|write status info to file"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
-"|DA|escrever informa��es de estado para o\n"
-"descritor de arquivo DA"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr ""
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "emular o modo descrito no RFC1991"
-
-#: g10/g10.c:442
-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:443
-#, fuzzy
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-msgstr ""
-"configurar todas as op��es de pacote,\n"
-"criptografia e \"digest\" para comportamento\n"
-"OpenPGP"
-
-#: g10/g10.c:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|usar frase secreta modo N"
-
-#: g10/g10.c:451
-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:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr ""
-"|NOME|usar algoritmo de criptografia NOME para\n"
-"frases secretas"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|usar algoritmo de compress�o N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr ""
-"eliminar o campo keyid dos pacotes\n"
-"criptografados"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr ""
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr ""
-
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr ""
-
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -793,15 +638,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -811,7 +656,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -819,311 +664,480 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr ""
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr ""
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr ""
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+#, fuzzy
+msgid "Compression: "
+msgstr "Coment�rio: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:983
+#: g10/g10.c:1166
+#, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "%s: novo arquivo de op��es criado\n"
+
+#: g10/g10.c:1172
+#, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1178
+#, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "%s: novo arquivo de op��es criado\n"
+
+#: g10/g10.c:1184
+#, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1190
+#, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1193
+#, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1196
 #, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:986
+#: g10/g10.c:1202
 #, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:989
+#: g10/g10.c:1205
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
 msgstr ""
 
-#: g10/g10.c:993
+#: g10/g10.c:1208
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1168
+#: g10/g10.c:1334
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "%s: novo arquivo de op��es criado\n"
+
+#: g10/g10.c:1601
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTA: %s n�o � para uso normal!\n"
+
+#: g10/g10.c:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, 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:1541
-msgid "could not parse keyserver URI\n"
-msgstr ""
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "chaveiro inv�lido"
+
+#: g10/g10.c:2134
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2137
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:1560
+#: g10/g10.c:2144
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:1563
+#: g10/g10.c:2147
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "armadura inv�lida"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "chaveiro inv�lido"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "NOTA: %s n�o � para uso normal!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr ""
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
+
+#: g10/g10.c:2546
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1845
-#, 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:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
+
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
+
+#: g10/g10.c:2572
 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:1858
+#: g10/g10.c:2576
 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:1862
-#, 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:1868
+#: g10/g10.c:2583
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1876
+#: g10/g10.c:2592
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1880
+#: g10/g10.c:2596
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1884
+#: g10/g10.c:2600
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2633
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s n�o faz sentido com %s!\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2778
 #, 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:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [nome_do_arquivo]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [nome_do_arquivo]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2908
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:3096
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "enumera��o de chaves secretas falhou: %s\n"
+
+#: g10/g10.c:3098
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:3109
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record falhou: %s\n"
+
+#: g10/g10.c:3119
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "enumera��o de chaves secretas falhou: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, 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:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:2691
+#: g10/g10.c:3659
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1132,114 +1146,158 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+#, fuzzy
+msgid "a user notation name must contain the '@' character\n"
+msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
+
+#: g10/g10.c:3678
 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:2737
+#: g10/g10.c:3712
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "a URL de pol�tica dada � inv�lida\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "ser mais silencioso"
+
+#: g10/gpgv.c:68
+#, fuzzy
+msgid "take the keys from this keyring"
+msgstr "Deletar esta chave do chaveiro? "
+
+#: g10/gpgv.c:70
+#, fuzzy
+msgid "make timestamp conflicts only a warning"
+msgstr "conflito de \"timestamp\""
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr ""
+"|DA|escrever informa��es de estado para o\n"
+"descritor de arquivo DA"
+
+#: g10/gpgv.c:95
+#, fuzzy
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
+
+#: g10/gpgv.c:98
+#, fuzzy
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sintaxe: gpgm [op��es] [arquivos]\n"
+"Utilit�rio de manuten��o do GnuPG\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "caractere \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 #, fuzzy
 msgid "Key is superseded"
 msgstr "A chave � protegida.\n"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -1253,21 +1311,28 @@ msgstr "rev- revoga��es de chaves incorreta\n"
 msgid "revocation comment: "
 msgstr "[revoga��o]"
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:258
-#, fuzzy, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
 "Nenhum valor de confian�a designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                   ou \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                   ou \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
@@ -1286,109 +1351,111 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:250
 #, c-format
-msgid " %d = Don't know\n"
+msgid " %d = I don't know or won't say\n"
 msgstr ""
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, fuzzy, c-format
 msgid " %d = I do NOT trust\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr ""
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, fuzzy, c-format
 msgid " %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr ""
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr ""
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
 msgstr ""
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 #, fuzzy
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave expirou\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:430
 #, fuzzy, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
-msgstr ""
-"%08lX: N�o se tem certeza de que esta chave realmente pertence ao dono,\n"
-"mas � aceita de qualquer modo\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s\n"
 
-#: g10/pkclist.c:513
+#: g10/pkclist.c:500
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -1401,210 +1468,227 @@ msgstr ""
 "sim � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "       Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 #, fuzzy
 msgid "Note: This key has been disabled.\n"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr ""
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 #, 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:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 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:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr ""
-
-#: g10/keygen.c:189
+#: g10/keygen.c:207
 #, fuzzy, c-format
-msgid "preference %c%lu duplicated\n"
+msgid "preference `%s' duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:194
-#, fuzzy, c-format
-msgid "too many `%c' preferences\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "Prefer�ncias demais"
+
+# muitas ou demais ???
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
 msgstr "Prefer�ncias demais"
 
-#: g10/keygen.c:264
+# muitas ou demais ???
+#: g10/keygen.c:218
 #, fuzzy
-msgid "invalid character in preference string\n"
+msgid "too many compression preferences\n"
+msgstr "Prefer�ncias demais"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:738
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:948
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/keygen.c:966 g10/keygen.c:984
-msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr ""
-
-#: g10/keyedit.c:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1617,37 +1701,29 @@ msgstr ""
 "              tamanho padr�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 #, 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:1030
+#: g10/keygen.c:1244
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1655,11 +1731,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:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1667,17 +1743,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1693,7 +1769,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1710,31 +1786,30 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, 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:1167
+#: g10/keygen.c:1381
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1742,11 +1817,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1762,44 +1837,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 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:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1810,28 +1885,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 #, 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1839,17 +1914,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 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"
@@ -1861,7 +1936,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1873,54 +1948,59 @@ 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:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#, fuzzy
+msgid "sorry, can't do this in batch mode\n"
+msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "escrevendo certificado privado para `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, 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:2211
+#: g10/keygen.c:2571
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: 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:2264
+#: g10/keygen.c:2630
 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"
@@ -1928,12 +2008,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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1941,7 +2021,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1949,623 +2029,709 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "assinatura falhou: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
-#: g10/encode.c:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:558 g10/sign.c:758
+#: g10/encode.c:634 g10/sign.c:863
 #, 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:703
-#, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr ""
-
-#: g10/encode.c:735
+#: g10/encode.c:818
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
-
-#: g10/export.c:238
+#: g10/export.c:198
 #, fuzzy, c-format
-msgid "key %08lX: not protected - skipped\n"
+msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:246
+#: g10/export.c:206
 #, fuzzy, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1438
+#: g10/getkey.c:1614
 #, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "h� uma chave secreta para esta chave p�blica!\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:296
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Voc� assinou estes IDs de usu�rio:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "assinatura %s de: %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:597
+#: g10/import.c:707
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
+msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:612
+#: g10/import.c:722
 #, fuzzy, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+msgid "key %s: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:619
-#, c-format
-msgid "key %08lX: no valid user IDs\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 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:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:636
+#: g10/import.c:746
 #, fuzzy, c-format
-msgid "key %08lX: new key - skipped\n"
+msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:646
+#: g10/import.c:755
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:663
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
+msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:774
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:844
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+
+#: g10/import.c:1064
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: 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:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1030
+#: g10/import.c:1299
 #, fuzzy, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1032
+#: g10/import.c:1301
 #, fuzzy, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
+msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
+msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
+msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
+msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr ""
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr ""
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1491
+#: g10/import.c:1804
 #, fuzzy, c-format
-msgid "key %08lX: direct key signature added\n"
+msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 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:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 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:233
+#: g10/keyedit.c:251
 #, 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:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr "%s: n�o � um banco de dados de confiabilidade\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr "%s: n�o � um banco de dados de confiabilidade\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 #, 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:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:380
+#: g10/keyedit.c:519
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:545
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:593
 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:422
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:657
 #, fuzzy, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:660
 #, fuzzy, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+#, fuzzy
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 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:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr ""
+
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2573,14 +2739,14 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:835
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:839
 #, fuzzy
 msgid ""
 "\n"
@@ -2589,7 +2755,7 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:844
 #, fuzzy
 msgid ""
 "\n"
@@ -2598,7 +2764,7 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 #, fuzzy
 msgid ""
 "\n"
@@ -2607,7 +2773,7 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 #, fuzzy
 msgid ""
 "\n"
@@ -2616,52 +2782,53 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2669,7 +2836,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2677,730 +2844,887 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "fazer uma assinatura separada"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "remove ID de usu�rio"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "addrevoker"
 msgstr "revkey"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 #, fuzzy
 msgid "set preference list"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 #, fuzzy
 msgid "updated preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "erro geral"
+
+#: g10/keyedit.c:1175
+msgid "set preferred keyserver URL"
+msgstr ""
+
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revuid"
+msgstr "revsig"
+
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revoke a user ID"
+msgstr "adiciona um novo ID de usu�rio"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 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:1201
+#: g10/keyedit.c:1433
 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:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+#, fuzzy
+msgid "Really revoke all selected user IDs? "
+msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
+
+#: g10/keyedit.c:1515
+#, fuzzy
+msgid "Really revoke this user ID? "
+msgstr "Realmente remover este ID de usu�rio? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "lista prefer�ncias"
+
+#: g10/keyedit.c:1612
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 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:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr ""
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr ""
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
 msgstr ""
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, c-format
-msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "imposs�vel criar %s: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "revkey"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr "A chave expira em %s\n"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr "trust"
+
+#: g10/keyedit.c:2107
 #, c-format
-msgid " trust: %c/%c"
+msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! a subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+#, fuzzy
+msgid "[revoked] "
+msgstr "revkey"
+
+#: g10/keyedit.c:2274
+#, fuzzy
+msgid "[expired] "
+msgstr "expire"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2399
 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:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 #, 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:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:2703
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+
+#: g10/keyedit.c:2788
+#, fuzzy
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2918
+#: g10/keyedit.c:3499
 #, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 #, 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:2931
+#: g10/keyedit.c:3512
 #, 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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:2975
+#: g10/keyedit.c:3558
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3013
+#: g10/keyedit.c:3597
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %s on %s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, fuzzy, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+
+#: g10/keyedit.c:3892
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keylist.c:91
+#: g10/keylist.c:179
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 #, fuzzy
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/keylist.c:127
+#: g10/keylist.c:286
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr ""
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr "A chave expira em %s\n"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/keylist.c:1001
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "revkey"
+
+#: g10/keylist.c:1357
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1003
+#: g10/keylist.c:1359
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1010
+#: g10/keylist.c:1366
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1012
+#: g10/keylist.c:1368
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
+#: g10/keylist.c:1372 g10/keylist.c:1376
 #, fuzzy
-msgid "     Key fingerprint ="
+msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
 #: g10/mainproc.c:248
@@ -3408,243 +3732,335 @@ msgstr "       Impress�o digital:"
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-# "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/mainproc.c:258
+#: g10/mainproc.c:262
 #, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "algoritmo de hash inv�lido `%s'\n"
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "algoritmo de criptografia desconhecido"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "dados criptografados com %s\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "criptografado com algoritmo desconhecido %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "Repita a frase secreta: "
+
+#: g10/mainproc.c:502
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "Repita a frase secreta: "
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+#, fuzzy
+msgid "WARNING: message was not integrity protected\n"
+msgstr "AVISO: nada exportado\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Nota��o: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Pol�tica: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Esta chave n�o � protegida.\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                   ou \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+#, fuzzy
+msgid "Key available at: "
+msgstr "Nenhuma ajuda dispon�vel"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, fuzzy, c-format
+msgid "Signature expired %s\n"
+msgstr "Esta chave n�o � protegida.\n"
+
+#: g10/mainproc.c:1643
+#, fuzzy, c-format
+msgid "Signature expires %s\n"
+msgstr "Esta chave n�o � protegida.\n"
+
+#: g10/mainproc.c:1646
+#, fuzzy, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "assinatura %s de: %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr ""
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr ""
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+#, fuzzy
+msgid "unknown"
+msgstr "vers�o desconhecida"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais n�o devem ser usados!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia � depreciado; por favor use algum\n"
 "algoritmo padr�o!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
 
-#: g10/misc.c:509
+#: g10/misc.c:491
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:513
+#: g10/misc.c:495
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
+#: g10/misc.c:508
+#, fuzzy
+msgid "Uncompressed"
+msgstr "n�o processado(s)"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "n�o processado(s)"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr ""
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "lendo op��es de `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "destinat�rio padr�o desconhecido `%s'\n"
+
 #: 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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3656,35 +4072,43 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:662
-#, fuzzy
-msgid "Enter passphrase\n"
-msgstr "Digite a frase secreta: "
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+#, fuzzy
+msgid "Enter passphrase\n"
+msgstr "Digite a frase secreta: "
+
+#: g10/passphrase.c:753
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr "linha muito longa\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Digite a frase secreta: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -3694,254 +4118,255 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Digite a frase secreta: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:101
+#: g10/pubkey-enc.c:103
 #, fuzzy, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, 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:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:243
+#: g10/pubkey-enc.c:286
 #, fuzzy, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/pubkey-enc.c:249
+#: g10/pubkey-enc.c:292
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "imposs�vel escrever para o chaveiro: %s\n"
-
-#: g10/hkp.c:96
-#, fuzzy, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "imposs�vel escrever para o chaveiro: %s\n"
-
-#: g10/hkp.c:175
-#, fuzzy, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr ""
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr ""
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
-
-#: g10/hkp.c:565
-#, fuzzy, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "imposs�vel escrever para o chaveiro: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "algoritmo de prote��o %d n�o � suportado\n"
+
+#: g10/seckey-cert.c:250
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:215
-#, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr ""
+
+#: g10/sig-check.c:102
+#, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
 
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
+msgid "public key %s is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:249
+#: g10/sig-check.c:192
 #, fuzzy, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr ""
+
+#: g10/sign.c:112
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:151
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:159
 #, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:303
+#: g10/sign.c:187
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:364
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
+msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/sign.c:644
+#: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:690
+#: g10/sign.c:794
 #, 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
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1029
+#: g10/sign.c:1138
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -3956,12 +4381,12 @@ msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
@@ -3970,199 +4395,269 @@ msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de banco de dados de confiabilidade muito grande\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: imposs�vel acessar: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: imposs�vel criar trava\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, fuzzy, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: imposs�vel criar trava\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registro de vers�o: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/trustdb.c:235
+#: g10/trustdb.c:257
 #, fuzzy, c-format
-msgid "key %08lX: accepted as trusted key\n"
+msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceita como chave confi�vel.\n"
 
-#: g10/trustdb.c:274
+#: g10/trustdb.c:295
 #, fuzzy, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "chave %08lX: imposs�vel coloc�-la no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:290
+#: g10/trustdb.c:310
 #, fuzzy, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "Certificados que levam a uma chave confiada plenamente:\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+msgid "never"
+msgstr ""
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "%s: n�o � um banco de dados de confiabilidade\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "%s: n�o � um banco de dados de confiabilidade\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "chave p�blica n�o encontrada"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:991
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr ""
+
+#: g10/trustdb.c:1911
+#, fuzzy
+msgid "no ultimately trusted keys found\n"
+msgstr "Certificados que levam a uma chave confiada plenamente:\n"
+
+#: g10/trustdb.c:1925
 #, fuzzy, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "chave p�blica n�o encontrada"
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:1515
+#: g10/trustdb.c:1948
 #, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4172,7 +4667,7 @@ msgstr ""
 "Por favor lembre-se de que o arquivo com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro arquivo dado na linha de comando.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
@@ -4199,15 +4694,14 @@ msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4226,26 +4720,31 @@ msgstr "%s: sufixo desconhecido\n"
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:326
+#: g10/openfile.c:349
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: diret�rio criado\n"
@@ -4273,46 +4772,46 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr ""
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "Esta � uma chave secreta! - realmente deletar? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4322,7 +4821,7 @@ msgstr ""
 "terceiros. Precisamos dele implementar a rede de confian�a, que n�o tem\n"
 "nada a ver com a rede de certificados (implicitamente criada)."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4330,88 +4829,53 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr "Se voc� quiser usar esta chave revogada assim mesmo, responda \"sim\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
 "Se voc� quiser usar esta chave n�o confi�vel assim mesmo, responda \"sim\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr ""
 "Digite o ID de usu�rio do destinat�rio para o qual voc� quer enviar a\n"
 "mensagem."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
-"\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Selecione o algoritmo a ser usado.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"DSA (ou DSS) � o algoritmo de assinatura digital que pode ser usado apenas\n"
-"para assinaturas. Este � o algoritmo recomendado porque a verifica��o de\n"
-"assinaturas DSA � muito mais r�pida que a verifica��o de ElGamal.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"ElGamal � um algoritmo que pode ser usado para assinatura e criptografia.\n"
-"O OpenPGP distingue dois tipos deste algoritmo: um apenas para criptografia\n"
-"e outro para assinatura+criptografia; na verdade s�o iguais, mas alguns\n"
-"par�metros precisam ser escolhidos de modo especial para criar uma chave\n"
-"segura para asssinatura: este programa faz isso, mas algumas outras\n"
-"implementa��es do OpenPGP n�o v�o necessariamente entender o tipo\n"
-"assinatura+criptografia.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"A  chave prim�ria precisa sempre ser uma chave capaz de fazer assinaturas;\n"
-"este � o motivo pelo qual a chave ElGamal apenas para criptografia n�o est�\n"
-"dispon�vel neste menu."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Apesar de estas chaves estarem definidas no RFC2440, elas n�o s�o "
-"recomendadas\n"
-"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:98
+#: g10/helptext.c:87
 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
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Digite o tamanho da chave"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Responda \"sim\" ou \"n�o\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4423,19 +4887,19 @@ msgstr ""
 "rea��o a erros - o sistema tentar� interpretar o valor dado como um "
 "intervalo."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Digite o nome do possuidor da chave"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 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:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Por favor digite um coment�rio (opcional)"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4449,11 +4913,11 @@ msgstr ""
 "O  para continuar a gera��o da chave.\n"
 "S  para interromper a gera��o da chave."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4494,11 +4958,11 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 
-#: g10/helptext.c:200
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4506,11 +4970,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:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Responda \"sim\" se quiser remover a subchave"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4520,7 +4984,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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4532,13 +4996,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:225
+#: g10/helptext.c:214
 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:229
+#: g10/helptext.c:218
 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"
@@ -4551,33 +5015,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:237
+#: g10/helptext.c:226
 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:244
+#: g10/helptext.c:233
 #, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
 msgstr "Por favor digite a frase secreta"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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:254
+#: g10/helptext.c:243
 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:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4585,7 +5049,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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4601,75 +5065,618 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 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:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, fuzzy, c-format
 msgid "error creating keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, fuzzy, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/keyring.c:1346
+#: g10/keyring.c:1360
 #, fuzzy, c-format
-msgid "checking keyring `%s'\n"
+msgid "caching keyring `%s'\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyring.c:1377
+#: g10/keyring.c:1406
 #, fuzzy, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu chaves processadas at� agora\n"
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1388
+#: g10/keyring.c:1418
 #, fuzzy, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr ""
+
+#: g10/photoid.c:87
+#, fuzzy, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: g10/photoid.c:97
+#, fuzzy
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#: g10/photoid.c:112
+#, fuzzy, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "%s: n�o � um banco de dados de confiabilidade\n"
+
+#: g10/photoid.c:129
+#, fuzzy
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Est� correto (s/n)? "
+
+#: g10/photoid.c:331
+#, fuzzy
+msgid "unable to display photo ID!\n"
+msgstr "imposs�vel abrir %s: %s\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr ""
+
+#: g10/exec.c:184
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: imposs�vel criar diret�rio: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr ""
+
+#: g10/exec.c:513
+#, fuzzy, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "%s: erro lendo registro de vers�o: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr ""
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr ""
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr ""
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr ""
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr ""
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, fuzzy, c-format
+msgid "build_packet failed: %s\n"
+msgstr "atualiza��o falhou: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "chave %08lX: sem ID de usu�rio\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr ""
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr ""
+
+#: g10/revoke.c:279 g10/revoke.c:476
+#, fuzzy
+msgid "Create a revocation certificate for this key? "
+msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr ""
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, fuzzy, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: g10/revoke.c:369
+#, fuzzy
+msgid "Revocation certificate created.\n"
+msgstr "chave %08lX: certificado de revoga��o adicionado\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr ""
+
+#: g10/revoke.c:429
+#, fuzzy, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "usu�rio `%s' n�o encontrado: %s\n"
+
+#: g10/revoke.c:458
+#, fuzzy, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "escrevendo certificado p�blico para `%s'\n"
+
+#: g10/revoke.c:469
+#, fuzzy
+msgid "public key does not match secret key!\n"
+msgstr "lid %lu n�o tem chave\n"
+
+#: g10/revoke.c:492
+#, fuzzy
+msgid "unknown protection algorithm\n"
+msgstr "algoritmo de compress�o desconhecido"
+
+#: g10/revoke.c:496
+#, fuzzy
+msgid "NOTE: This key is not protected!\n"
+msgstr "Esta chave n�o � protegida.\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+
+#: g10/revoke.c:588
+#, fuzzy
+msgid "Please select the reason for the revocation:\n"
+msgstr "rev- revoga��es de chaves incorreta\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr ""
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr ""
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+
+#: g10/revoke.c:669
+#, fuzzy, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "rev- revoga��es de chaves incorreta\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr ""
+
+#: g10/revoke.c:676
+#, fuzzy
+msgid "Is this okay? "
+msgstr "Usa esta chave de qualquer modo? "
+
+#: g10/tdbdump.c:104
+#, fuzzy, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Lista de valores de confian�a designados, criada em %s\n"
+"# (Use \"gpgm --import-ownertrust\" para restaur�-los)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "imposs�vel abrir arquivo: %s\n"
+
+#: g10/tdbdump.c:151
+#, fuzzy
+msgid "line too long\n"
+msgstr "linha muito longa\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "erro: falta dois pontos\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "erro: impress�o digital inv�lida\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "erro: nenhum valor de confian�a\n"
+
+#: g10/tdbdump.c:204
+#, fuzzy, c-format
+msgid "error finding trust record: %s\n"
+msgstr "erro lendo registro de diret�rio: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "erro de leitura: %s\n"
+
+#~ msgid "store only"
+#~ msgstr "apenas armazenar"
+
+#, fuzzy
+#~ msgid "sign a key non-revocably"
+#~ msgstr "assinar uma chave localmente"
+
+#, fuzzy
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "assinar uma chave localmente"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "listar apenas as seq��ncias de pacotes"
+
+# ownertrust ???
+#~ msgid "export the ownertrust values"
+#~ msgstr "exportar os valores de confian�a"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "importar os valores de confian�a"
+
+#, fuzzy
+#~ msgid "unattended trust database update"
+#~ msgstr "atualizar o banco de dados de confiabilidade"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr ""
+#~ "consertar um banco de dados de confiabilidade\n"
+#~ "danificado"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "retirar a armadura de um arquivo ou de \"stdin\""
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "criar armadura para um arquivo ou \"stdin\""
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NOME|usar NOME como destinat�rio padr�o"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "usar a chave padr�o como destinat�rio padr�o"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "nunca usar o terminal"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "for�ar assinaturas v3"
+
+#, fuzzy
+#~ msgid "do not force v3 signatures"
+#~ msgstr "for�ar assinaturas v3"
+
+#, fuzzy
+#~ msgid "force v4 key signatures"
+#~ msgstr "for�ar assinaturas v3"
+
+#, fuzzy
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "for�ar assinaturas v3"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "sempre usar um MDC para criptografar"
+
+#, fuzzy
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "sempre usar um MDC para criptografar"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "modo n�o-interativo: nunca perguntar"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "assumir sim para a maioria das perguntas"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "assumir n�o para a maioria das perguntas"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "adicionar este chaveiro � lista de chaveiros"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "adicionar este chaveiro secreto � lista"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NOME|usar NOME como chave secreta padr�o"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|ENDERE�O|usar este servidor para buscar chaves"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr ""
+#~ "|NOME|definir mapa de caracteres do terminal como\n"
+#~ "NOME"
+
+#~ msgid "read options from file"
+#~ msgstr "ler op��es do arquivo"
+
+#, fuzzy
+#~ msgid "|[file]|write status info to file"
+#~ msgstr ""
+#~ "|DA|escrever informa��es de estado para o\n"
+#~ "descritor de arquivo DA"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emular o modo descrito no RFC1991"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "configurar todas as op��es de pacote,\n"
+#~ "criptografia e \"digest\" para comportamento\n"
+#~ "OpenPGP"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|usar frase secreta modo N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
+#~ "para frases secretas"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|NOME|usar algoritmo de criptografia NOME para\n"
+#~ "frases secretas"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NOME|usar algoritmo de criptografia NOME"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|usar algoritmo de compress�o N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr ""
+#~ "eliminar o campo keyid dos pacotes\n"
+#~ "criptografados"
+
+#, fuzzy
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: N�o se tem certeza de que esta chave realmente pertence ao dono,\n"
+#~ "mas � aceita de qualquer modo\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
+
+#, fuzzy
+#~ msgid " (default)"
+#~ msgstr "(o padr�o � 1)"
+
+#~ msgid "Notation: "
+#~ msgstr "Nota��o: "
+
+#~ msgid "Policy: "
+#~ msgstr "Pol�tica: "
+
+#, fuzzy
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "imposs�vel escrever para o chaveiro: %s\n"
+
+#, fuzzy
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "imposs�vel escrever para o chaveiro: %s\n"
+
+#, fuzzy
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "erro na leitura de `%s': %s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "esta � uma chave ElGamal gerada pelo PGP que N�O � segura para "
+#~ "assinaturas!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "a chave foi criada %lu segundo no futuro\n"
+#~ "(viagem no tempo ou problema no rel�gio)\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "a chave foi criada %lu segundos no futuro\n"
+#~ "(viagem no tempo ou problema no rel�gio)\n"
+
+#, fuzzy
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "Certificados que levam a uma chave confiada plenamente:\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Selecione o algoritmo a ser usado.\n"
+#~ "\n"
+#~ "DSA (ou DSS) � o algoritmo de assinatura digital que pode ser usado "
+#~ "apenas\n"
+#~ "para assinaturas. Este � o algoritmo recomendado porque a verifica��o de\n"
+#~ "assinaturas DSA � muito mais r�pida que a verifica��o de ElGamal.\n"
+#~ "\n"
+#~ "ElGamal � um algoritmo que pode ser usado para assinatura e "
+#~ "criptografia.\n"
+#~ "O OpenPGP distingue dois tipos deste algoritmo: um apenas para "
+#~ "criptografia\n"
+#~ "e outro para assinatura+criptografia; na verdade s�o iguais, mas alguns\n"
+#~ "par�metros precisam ser escolhidos de modo especial para criar uma chave\n"
+#~ "segura para asssinatura: este programa faz isso, mas algumas outras\n"
+#~ "implementa��es do OpenPGP n�o v�o necessariamente entender o tipo\n"
+#~ "assinatura+criptografia.\n"
+#~ "\n"
+#~ "A  chave prim�ria precisa sempre ser uma chave capaz de fazer "
+#~ "assinaturas;\n"
+#~ "este � o motivo pelo qual a chave ElGamal apenas para criptografia n�o "
+#~ "est�\n"
+#~ "dispon�vel neste menu."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Apesar de estas chaves estarem definidas no RFC2440, elas n�o s�o "
+#~ "recomendadas\n"
+#~ "porque n�o s�o suportadas por todos os programas e assinaturas criadas "
+#~ "com\n"
+#~ "elas s�o grandes e sua verifica��o � lenta."
+
+#, fuzzy
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu chaves processadas at� agora\n"
+
+#, fuzzy
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "chave %08lX: sem ID de usu�rio\n"
+
+# INICIO MENU
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "sair"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
+
+#, fuzzy
+#~ msgid "Create anyway? "
+#~ msgstr "Usa esta chave de qualquer modo? "
+
+# "hash" poderia ser "espalhamento", mas n�o fica claro
+#, fuzzy
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "algoritmo de hash inv�lido `%s'\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "you have to start GnuPG again, so it can read the new configuration file\n"
@@ -4812,9 +5819,6 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "erro lendo chave prim�ria para LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record falhou: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "chave %08lX: pedido de registro falhou\n"
 
@@ -4827,9 +5831,6 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "chave %08lX: chaves secreta e p�blica n�o s�o correspondentes\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "enumera��o de chaves secretas falhou: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
 
@@ -4888,15 +5889,9 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "lid %lu: inserted\n"
 #~ msgstr "lid %lu: inserido\n"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "erro lendo registro de diret�rio: %s\n"
-
 #~ msgid "\t%lu keys inserted\n"
 #~ msgstr "\t%lu chaves inseridas\n"
 
-#~ msgid "enumerate keyblocks failed: %s\n"
-#~ msgstr "enumera��o de blocos de chaves falhou: %s\n"
-
 #~ msgid "lid %lu: dir record w/o key - skipped\n"
 #~ msgstr "lid %lu: registro de diret�rio sem chave - ignorado\n"
 
@@ -5008,9 +6003,6 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "do not write comment packets"
 #~ msgstr "n�o escrever pacotes de coment�rio"
 
-#~ msgid "(default is 1)"
-#~ msgstr "(o padr�o � 1)"
-
 #~ msgid "(default is 3)"
 #~ msgstr "(o padr�o � 3)"
 
@@ -5062,9 +6054,6 @@ msgstr "%s: chaveiro criado\n"
 #~ msgstr ""
 #~ "lista de sugest�es %lu[%d] de %lu n�o aponta para registro de diret�rio\n"
 
-#~ msgid "lid %lu does not have a key\n"
-#~ msgstr "lid %lu n�o tem chave\n"
-
 #~ msgid "lid %lu: can't get keyblock: %s\n"
 #~ msgstr "lid %lu: imposs�vel pegar bloco de chaves: %s\n"
 
@@ -5113,12 +6102,6 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "error writing keyring `%': %s\n"
 #~ msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "imposs�vel abrir arquivo: %s\n"
-
-#~ msgid "read error: %s\n"
-#~ msgstr "erro de leitura: %s\n"
-
 #~ msgid "writing keyblock\n"
 #~ msgstr "escrevendo bloco de chaves\n"
 
@@ -5136,13 +6119,6 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "Usage: gpgm [options] [files] (-h for help)"
 #~ msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#~ msgid ""
-#~ "Syntax: gpgm [options] [files]\n"
-#~ "GnuPG maintenance utility\n"
-#~ msgstr ""
-#~ "Sintaxe: gpgm [op��es] [arquivos]\n"
-#~ "Utilit�rio de manuten��o do GnuPG\n"
-
 #~ msgid "usage: gpgm [options] "
 #~ msgstr "Uso: gpgm [op��es] "
 
@@ -5176,25 +6152,9 @@ msgstr "%s: chaveiro criado\n"
 #~ msgid "user '%s' not in trustdb\n"
 #~ msgstr "usu�rio `%s' n�o est� no banco de dados de confiabilidade\n"
 
-#~ msgid ""
-#~ "# List of assigned trustvalues, created %s\n"
-#~ "# (Use \"gpgm --import-ownertrust\" to restore them)\n"
-#~ msgstr ""
-#~ "# Lista de valores de confian�a designados, criada em %s\n"
-#~ "# (Use \"gpgm --import-ownertrust\" para restaur�-los)\n"
-
 #~ msgid "directory record w/o primary key\n"
 #~ msgstr "registro de diret�rio sem chave prim�ria\n"
 
-#~ msgid "error: missing colon\n"
-#~ msgstr "erro: falta dois pontos\n"
-
-#~ msgid "error: invalid fingerprint\n"
-#~ msgstr "erro: impress�o digital inv�lida\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "erro: nenhum valor de confian�a\n"
-
 #~ msgid "key not in trustdb, searching ring.\n"
 #~ msgstr ""
 #~ "chave n�o encontrada no banco de dados de confiabilidade, procurando no "
diff --git a/po/ro.po b/po/ro.po
new file mode 100644
index 000000000..d7e74becf
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,5725 @@
+# Mesajele �n limba rom�n� pentru gnupg.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# Acest fi�ier este distribuit sub aceea�i licen�� ca �i pachetul gnupg.
+# Laurentiu Buzdugan <[email protected]>, 2003.
+#
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-06-17 12:00-0500\n"
+"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
+"Language-Team: Romanian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: util/secmem.c:90
+msgid "WARNING: using insecure memory!\n"
+msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
+
+#: util/secmem.c:91
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
+
+#: util/secmem.c:340
+msgid "operation is not possible without initialized secure memory\n"
+msgstr ""
+"opera�ia nu este posibil� f�r� memorie protejat� (secure) ini�ializat�\n"
+
+#: util/secmem.c:341
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
+
+#: util/miscutil.c:307 util/miscutil.c:344
+msgid "yes"
+msgstr "da"
+
+#: util/miscutil.c:308 util/miscutil.c:349
+msgid "yY"
+msgstr "dD"
+
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "nu"
+
+#: util/miscutil.c:311 util/miscutil.c:350
+msgid "nN"
+msgstr "nN"
+
+#: util/miscutil.c:348 g10/keyedit.c:1138
+msgid "quit"
+msgstr "termin�"
+
+#: util/miscutil.c:351
+msgid "qQ"
+msgstr "tT"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "eroare general�"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "tip de pachet necunoscut"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "versiune necunoscut�"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "algoritm pubkey necunoscut"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "algoritm rezumat necunoscut"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "cheie public� incorect�"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "cheie secret� incorect�"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "semn�tur� incorect�"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "eroare checksum"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "fraz�-parol� incorect�"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "cheia public� nu a fost g�sit�"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "algoritm cifrare necunoscut"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "nu pot deschide inelul de chei"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "pachet invalid"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "armur� invalid�"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "nu exist� acest id utilizator"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "cheia secret� nu e disponibil�"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "a fost folosit� o cheie secret� gre�it�"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "nu este suportat(�)"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "cheie incorect�"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "eroare citire fi�ier"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "eroare scriere fi�ier"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "algoritm compresie necunoscut"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "eroare deschidere fi�ier"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "eroare creare fi�ier"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "fraz�-parol� invalid�"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "algoritm pubkey neimplementat"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "algoritm cifrare neimplementat"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "clas� semn�turi necunoscut�"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "eroare baz� de date �ncredere"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "MPI incorect"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "limit� resurse"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "inel de chei invalid"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "certificat incorect"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "id utilizator anormal"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "eroare �nchidere fi�ier"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "eroare redenumire fi�ier"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "eroare �tergere fi�ier"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "date nea�teptate"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "conflict timestamp"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "algoritm pubkey nefolosibil"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "fi�ierul exist�"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "cheie slab�"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "argument invalid"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "URI incorect"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "URI nesuportat"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "eroare re�ea"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "necifrat"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "neprocesat"
+
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "cheie public� de nefolosit"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "cheie secret� de nefolosit"
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr "eroare server de chei"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... acesta este un bug (%s:%d:%s)\n"
+
+#: util/logger.c:285
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "a�i g�sit un bug ... (%s:%d)\n"
+
+#: cipher/random.c:163
+msgid "no entropy gathering module detected\n"
+msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
+
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "nu pot deschide `%s': %s\n"
+
+#: cipher/random.c:391
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "nu pot ob�ine statistici `%s': %s\n"
+
+#: cipher/random.c:396
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "`%s' nu este un fi�ier normal - ignorat\n"
+
+#: cipher/random.c:401
+msgid "note: random_seed file is empty\n"
+msgstr "not�: fi�ier random_seed este gol\n"
+
+#: cipher/random.c:407
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr ""
+"AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
+"folosit�\n"
+
+#: cipher/random.c:415
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "nu pot citi `%s': %s\n"
+
+#: cipher/random.c:453
+msgid "note: random_seed file not updated\n"
+msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
+
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "nu pot crea `%s': %s\n"
+
+#: cipher/random.c:480
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "nu pot scrie `%s': %s\n"
+
+#: cipher/random.c:483
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "nu pot �nchide `%s': %s\n"
+
+#: cipher/random.c:728
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr ""
+"AVERISMENT: este folosit un generator de numere aleatoare nesigur "
+"(insecure)!!\n"
+
+#: cipher/random.c:729
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"Generatorul de numere aleatoare este doar ceva temporar pentru\n"
+"a-l face s� mearg� - nu este nicidecum un GNA sigur (secure)!\n"
+"\n"
+"NU FOLOSI�I NICI O DAT� GENERAT� DE ACEST PROGRAM!!\n"
+"\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Nu sunt disponibili destui octe�i aleatori.  V� rug�m face�i ceva pentru\n"
+"a da sistemului de operare o �ans� de a colecta mai mult� entropie\n"
+"(Mai sunt necesari %d octe�i)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "algoritm rezumat `%s' este numai-citire �n acest� edi�ie\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"V� rug�m a�tepta�i, este adunat� entropia. Face�i ceva dac� v� ajut� s�\n"
+"nu v� plictisi�i, pentru c� va �mbun�t��i calitatea entropiei.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
+
+#: g10/g10.c:354
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Comenzi:\n"
+" "
+
+#: g10/g10.c:356
+msgid "|[file]|make a signature"
+msgstr "|[fi�ier]|creaz� o semn�tur�"
+
+#: g10/g10.c:357
+msgid "|[file]|make a clear text signature"
+msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
+
+#: g10/g10.c:358
+msgid "make a detached signature"
+msgstr "creaz� o semn�tur� deta�at�"
+
+#: g10/g10.c:359
+msgid "encrypt data"
+msgstr "cifreaz� datele"
+
+#: g10/g10.c:361
+msgid "encryption only with symmetric cipher"
+msgstr "cifreaz� numai cu cifru simetric"
+
+#: g10/g10.c:363
+msgid "decrypt data (default)"
+msgstr "decripteaz� datele (implicit)"
+
+#: g10/g10.c:365
+msgid "verify a signature"
+msgstr "verific� o semn�tur�"
+
+#: g10/g10.c:367
+msgid "list keys"
+msgstr "enumer� chei"
+
+#: g10/g10.c:369
+msgid "list keys and signatures"
+msgstr "enumer� chei �i semn�turi"
+
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "verific� semn�turile cheii"
+
+#: g10/g10.c:371
+msgid "list keys and fingerprints"
+msgstr "enumer� chei �i amprente"
+
+#: g10/g10.c:372
+msgid "list secret keys"
+msgstr "enumer� chei secrete"
+
+#: g10/g10.c:373
+msgid "generate a new key pair"
+msgstr "genereaz� o nou� perechi de chei"
+
+#: g10/g10.c:374
+msgid "remove keys from the public keyring"
+msgstr "�terge chei de pe inelul de chei public"
+
+#: g10/g10.c:376
+msgid "remove keys from the secret keyring"
+msgstr "�terge chei de pe inelul de chei secret"
+
+#: g10/g10.c:377
+msgid "sign a key"
+msgstr "semneaz� o cheie"
+
+#: g10/g10.c:378
+msgid "sign a key locally"
+msgstr "semneaz� o cheie local"
+
+#: g10/g10.c:381
+msgid "sign or edit a key"
+msgstr "semneaz� sau editeaz� o cheie"
+
+#: g10/g10.c:382
+msgid "generate a revocation certificate"
+msgstr "genereaz� un certificat de revocare"
+
+#: g10/g10.c:384
+msgid "export keys"
+msgstr "export� chei"
+
+#: g10/g10.c:385
+msgid "export keys to a key server"
+msgstr "export� chei pentru un server de chei"
+
+#: g10/g10.c:386
+msgid "import keys from a key server"
+msgstr "import� chei de la un server de chei"
+
+#: g10/g10.c:388
+msgid "search for keys on a key server"
+msgstr "caut� pentru chei pe un server de chei"
+
+#: g10/g10.c:390
+msgid "update all keys from a keyserver"
+msgstr "actualizeaz� toate cheile de la un server de chei"
+
+#: g10/g10.c:393
+msgid "import/merge keys"
+msgstr "import�/combin� chei"
+
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
+
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
+
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
+
+#: g10/g10.c:406
+msgid "update the trust database"
+msgstr "actualizeaz� baza de date de �ncredere"
+
+#: g10/g10.c:413
+msgid "|algo [files]|print message digests"
+msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
+
+#: g10/g10.c:417 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Op�iuni:\n"
+" "
+
+#: g10/g10.c:419
+msgid "create ascii armored output"
+msgstr "creaz� ie�ire �n armur� ascii"
+
+#: g10/g10.c:421
+msgid "|NAME|encrypt for NAME"
+msgstr "|NUME|cifrare pentru NUME"
+
+#: g10/g10.c:432
+msgid "use this user-id to sign or decrypt"
+msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
+
+#: g10/g10.c:433
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
+
+#: g10/g10.c:438
+msgid "use canonical text mode"
+msgstr "folose�te modul text canonic"
+
+#: g10/g10.c:448
+msgid "use as output file"
+msgstr "folose�te ca fi�ier ie�ire"
+
+#: g10/g10.c:450 g10/gpgv.c:66
+msgid "verbose"
+msgstr "locvace"
+
+#: g10/g10.c:461
+msgid "do not make any changes"
+msgstr "nu face nici o schimbare"
+
+#: g10/g10.c:462
+msgid "prompt before overwriting"
+msgstr "�ntreab� �nainte de a suprascrie"
+
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
+
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:535
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
+
+#: g10/g10.c:538
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"Exemple:\n"
+"\n"
+" -se -r Dan [fi�ier]        semneaz� �i cifreaz� pentru utilizatorul Dan\n"
+" --clearsign [fi�ier]       creaz� o semn�tur� text �n clar\n"
+" --detach-sign [fi�ier]     creaz� o semn�tur� deta�at�\n"
+" --list-keys [nume]         arat� chei\n"
+" --fingerprint [nume]       arat� amprente\n"
+
+#: g10/g10.c:713 g10/gpgv.c:91
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr "Raporta�i bug-uri la <[email protected]>.\n"
+
+#: g10/g10.c:730
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: g10/g10.c:733
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintax�: gpg [op�iuni] [fi�iere]\n"
+"sign, check, encrypt sau decrypt\n"
+"opera�iunea implicit� depinde de datele de intrare\n"
+
+#: g10/g10.c:744
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Algoritmuri suportate:\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Cifru: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Compresie: "
+
+#: g10/g10.c:848
+msgid "usage: gpg [options] "
+msgstr "folosire: gpg [op�iuni] "
+
+#: g10/g10.c:951
+msgid "conflicting commands\n"
+msgstr "comenzi �n conflict\n"
+
+#: g10/g10.c:969
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr "nu am g�sit nici un semn = �n defini�ia grupului \"%s\"\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr ""
+"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
+"\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr ""
+"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
+"\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr ""
+"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
+"\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr ""
+"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
+"\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr ""
+"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
+"\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr ""
+"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
+"\"\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "articol configurare necunoscut \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
+
+#: g10/g10.c:1637
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
+
+#: g10/g10.c:1641
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "fi�ier op�iuni `%s': %s\n"
+
+#: g10/g10.c:1648
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "citesc op�iuni din `%s'\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
+
+#: g10/g10.c:1887
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr ""
+"extensie cifru \"%s\" nu a fost �nc�rcat din cauza permisiunilor nesigure "
+"(unsafe)\n"
+
+#: g10/g10.c:2099
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s nu este un set de carectere valid\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "nu am putut interpreta URI pentru serverul de chei\n"
+
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: op�iuni export invalide\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "op�iuni export invalide\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: op�iuni import invalide\n"
+
+#: g10/g10.c:2137
+msgid "invalid import options\n"
+msgstr "op�iuni import invalide\n"
+
+#: g10/g10.c:2144
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: op�iuni export invalide\n"
+
+#: g10/g10.c:2147
+msgid "invalid export options\n"
+msgstr "op�iuni export invalide\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: op�iuni import invalide\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "op�iuni import invalide\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: op�iuni export invalide\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "op�iuni export invalide\n"
+
+#: g10/g10.c:2208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "nu pot seta cale-execu�ie ca %s\n"
+
+#: g10/g10.c:2398
+msgid "WARNING: program may create a core file!\n"
+msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
+
+#: g10/g10.c:2402
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
+
+#: g10/g10.c:2411
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s nu este permis cu %s!\n"
+
+#: g10/g10.c:2414
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s nu are sens cu %s!\n"
+
+#: g10/g10.c:2435
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr ""
+"pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
+"--pgp2\n"
+
+#: g10/g10.c:2441
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr ""
+"nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
+
+#: g10/g10.c:2447
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr ""
+"trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
+"activat.\n"
+
+#: g10/g10.c:2460
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
+
+#: g10/g10.c:2528 g10/g10.c:2552
+msgid "selected cipher algorithm is invalid\n"
+msgstr "algoritm cifrare selectat este invalid\n"
+
+#: g10/g10.c:2534 g10/g10.c:2558
+msgid "selected digest algorithm is invalid\n"
+msgstr "algoritm rezumat selectat este invalid\n"
+
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "algoritm cifrare selectat este invalid\n"
+
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "algoritm rezumat certificare selectat este invalid\n"
+
+#: g10/g10.c:2561
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
+
+#: g10/g10.c:2563
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth trebuie s� fie �n intervalul 1..255\n"
+
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
+
+#: g10/g10.c:2572
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
+
+#: g10/g10.c:2576
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
+
+#: g10/g10.c:2583
+msgid "invalid default preferences\n"
+msgstr "preferin�e implicite invalide\n"
+
+#: g10/g10.c:2592
+msgid "invalid personal cipher preferences\n"
+msgstr "preferin�e cifrare personale invalide\n"
+
+#: g10/g10.c:2596
+msgid "invalid personal digest preferences\n"
+msgstr "preferin�e rezumat personale invalide\n"
+
+#: g10/g10.c:2600
+msgid "invalid personal compress preferences\n"
+msgstr "preferin�e compresie personale invalide\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s nu merge �nc� cu %s!\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "nu pute�i folosi algoritmul de cifrare \"%s\" c�t� vreme �n modul %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "nu pute�i folosi algorimul de rezumat \"%s\" c�t� vreme �n modul %s\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"nu pute�i folosi algoritmul de compresie \"%s\" c�t� vreme �n modul %s\n"
+
+#: g10/g10.c:2778
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
+
+#: g10/g10.c:2789
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+"AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
+"public�\n"
+
+#: g10/g10.c:2800
+msgid "--store [filename]"
+msgstr "--store [nume_fi�ier]"
+
+#: g10/g10.c:2807
+msgid "--symmetric [filename]"
+msgstr "--symmetric [nume_fi�ier]"
+
+#: g10/g10.c:2819
+msgid "--encrypt [filename]"
+msgstr "--encrypt [nume_fi�ier]"
+
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [nume_fi�ier]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
+
+#: g10/g10.c:2855
+msgid "--sign [filename]"
+msgstr "--sign [nume_fi�ier]"
+
+#: g10/g10.c:2868
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [nume_fi�ier]"
+
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [nume_fi�ier]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
+
+#: g10/g10.c:2908
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [nume_fi�ier]"
+
+#: g10/g10.c:2917
+msgid "--clearsign [filename]"
+msgstr "--clearsign [nume_fi�ier]"
+
+#: g10/g10.c:2942
+msgid "--decrypt [filename]"
+msgstr "--decrypt [nume_fi�ier]"
+
+#: g10/g10.c:2950
+msgid "--sign-key user-id"
+msgstr "--sign-key id-utilizator"
+
+#: g10/g10.c:2954
+msgid "--lsign-key user-id"
+msgstr "--lsign-key id-utilizator"
+
+#: g10/g10.c:2958
+msgid "--nrsign-key user-id"
+msgstr "--nrsign-key id-utilizator"
+
+#: g10/g10.c:2962
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key id-utilizator"
+
+#: g10/g10.c:2986
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key id-utilizator [comenzi]"
+
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "nu pot deschide %s: %s\n"
+
+#: g10/g10.c:3057
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
+
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "trimitere server de chei e�uat�: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "recep�ie server de chei e�uat�: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "export cheie e�uat: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "c�utare server de chei e�uat�: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "actualizare server de chei e�uat�: %s\n"
+
+#: g10/g10.c:3160
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "eliminarea armurii a e�uat: %s\n"
+
+#: g10/g10.c:3168
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "punerea armurii a e�uat: %s\n"
+
+#: g10/g10.c:3255
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "algoritm hash invalid `%s'\n"
+
+#: g10/g10.c:3378
+msgid "[filename]"
+msgstr "[nume_fi�ier]"
+
+#: g10/g10.c:3382
+msgid "Go ahead and type your message ...\n"
+msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
+
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "nu pot deschide `%s'\n"
+
+#: g10/g10.c:3659
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
+"�i s� se termine cu un '='\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
+
+#: g10/g10.c:3678
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+"o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
+
+#: g10/g10.c:3712
+msgid "the given certification policy URL is invalid\n"
+msgstr "URL-ul politicii de certificare furnizat este invalid\n"
+
+#: g10/g10.c:3714
+msgid "the given signature policy URL is invalid\n"
+msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "fii oarecum mai t�cut"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "ia cheile de pe acest inel de chei"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "d� numai un avertisment la conflicte de timestamp"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|scrie informa�ii de stare �n acest FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sintax�: gpg [op�iuni] [fi�iere]\n"
+"Verific� semn�turi folosind cheile cunoscute ca fiind de �ncredere\n"
+
+#: g10/armor.c:317
+#, c-format
+msgid "armor: %s\n"
+msgstr "armur�: %s\n"
+
+#: g10/armor.c:346
+msgid "invalid armor header: "
+msgstr "header armur� invalid: "
+
+#: g10/armor.c:353
+msgid "armor header: "
+msgstr "header armur�: "
+
+#: g10/armor.c:364
+msgid "invalid clearsig header\n"
+msgstr "header clearsig invalid\n"
+
+#: g10/armor.c:416
+msgid "nested clear text signatures\n"
+msgstr "semn�turi text �n clar �ncuib�rite\n"
+
+#: g10/armor.c:553
+msgid "invalid dash escaped line: "
+msgstr "linie cu liniu�� escape invalid�: "
+
+#: g10/armor.c:565
+msgid "unexpected armor:"
+msgstr "armur� nea�teptat�:"
+
+#: g10/armor.c:695 g10/armor.c:1276
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "caracter radix64 invalid %02x s�rit\n"
+
+#: g10/armor.c:738
+msgid "premature eof (no CRC)\n"
+msgstr "eof prematur (nici un CRC)\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in CRC)\n"
+msgstr "eof prematur (�n CRC)\n"
+
+#: g10/armor.c:776
+msgid "malformed CRC\n"
+msgstr "CRC anormal\n"
+
+#: g10/armor.c:780 g10/armor.c:1313
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "eroare CRC; %06lx - %06lx\n"
+
+#: g10/armor.c:800
+msgid "premature eof (in Trailer)\n"
+msgstr "eof prematur (�n Trailer)\n"
+
+#: g10/armor.c:804
+msgid "error in trailer line\n"
+msgstr "eroare linia de trailer\n"
+
+#: g10/armor.c:1091
+msgid "no valid OpenPGP data found.\n"
+msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
+
+#: g10/armor.c:1096
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
+
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
+"cu bug-uri\n"
+
+#: g10/pkclist.c:61 g10/revoke.c:576
+msgid "No reason specified"
+msgstr "Nici un motiv specificat"
+
+#: g10/pkclist.c:63 g10/revoke.c:578
+msgid "Key is superseded"
+msgstr "Cheia este �nlocuit�"
+
+#: g10/pkclist.c:65 g10/revoke.c:577
+msgid "Key has been compromised"
+msgstr "Cheia a fost compromis�"
+
+#: g10/pkclist.c:67 g10/revoke.c:579
+msgid "Key is no longer used"
+msgstr "Cheia nu mai este folosit�"
+
+#: g10/pkclist.c:69 g10/revoke.c:580
+msgid "User ID is no longer valid"
+msgstr "ID utilizator nu mai este valid"
+
+#: g10/pkclist.c:73
+msgid "reason for revocation: "
+msgstr "motiv pentru revocare: "
+
+#: g10/pkclist.c:90
+msgid "revocation comment: "
+msgstr "comentariu revocare: "
+
+#: g10/pkclist.c:195
+msgid "iImMqQsS"
+msgstr "iImMtTsS"
+
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
+msgstr ""
+"Nici o valoare de �ncredere atribuit� lui:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                aka \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                aka \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+"V� rug�m decide�i c�t de mult� �ncredere ave�i �n acest utilizator\n"
+"pentru a verifica cheile altor utilizatori (privind la pa�apoarte,\n"
+"verific�nd amprentele din diferite surse...)?\n"
+"\n"
+
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = Nu �tiu\n"
+
+#: g10/pkclist.c:252
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = NU am �ncredere\n"
+
+#: g10/pkclist.c:254
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = Am o �ncredere marginal�\n"
+
+#: g10/pkclist.c:256
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = Am toat� �ncrederea\n"
+
+#: g10/pkclist.c:258
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = Am �ncredere suprem�\n"
+
+#: g10/pkclist.c:261
+msgid " i = please show me more information\n"
+msgstr " i = arat�-mi mai multe informa�ii\n"
+
+#: g10/pkclist.c:264
+msgid " m = back to the main menu\n"
+msgstr " m = �napoi la meniul principal\n"
+
+#: g10/pkclist.c:267
+msgid " s = skip this key\n"
+msgstr " s = s�ri peste cheia asta\n"
+
+#: g10/pkclist.c:268
+msgid " q = quit\n"
+msgstr " t = termin�\n"
+
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
+msgid "Your decision? "
+msgstr "Decizia d-voastr�? "
+
+#: g10/pkclist.c:299
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? "
+
+#: g10/pkclist.c:313
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
+
+#: g10/pkclist.c:387
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "cheia %08lX: cheia a fost revocat�!\n"
+
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
+msgid "Use this key anyway? "
+msgstr "Folosi�i oricum aceast� cheie? "
+
+#: g10/pkclist.c:399
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "cheie %08lX: subcheia a fost revocat�!\n"
+
+#: g10/pkclist.c:420
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: cheia a expirat\n"
+
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
+"proprietarului\n"
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: Noi NU avem �ncredere �n acest� cheie\n"
+
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r "
+"proprietarului\n"
+
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "Aceast� cheie apar�ine probabil proprietarului\n"
+
+#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "Aceast� cheie ne apar�ine\n"
+
+#: g10/pkclist.c:500
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+"NU este sigur c� cheie apar�ine persoanei numite �n ID-ul\n"
+"utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
+"r�spunde cu da la urm�toarea �ntrebare\n"
+"\n"
+
+#: g10/pkclist.c:514 g10/pkclist.c:544
+msgid "WARNING: Using untrusted key!\n"
+msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
+
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"AVERTISMENT: aceast� cheie poate fi revocat� (cheia de revocare nu este "
+"prezent�)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
+
+#: g10/pkclist.c:563
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
+
+#: g10/pkclist.c:564
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
+
+#: g10/pkclist.c:570
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
+
+#: g10/pkclist.c:575
+msgid "Note: This key has been disabled.\n"
+msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
+
+#: g10/pkclist.c:580
+msgid "Note: This key has expired!\n"
+msgstr "Not�: Aceast� cheie a expirat!\n"
+
+#: g10/pkclist.c:591
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr ""
+"AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
+
+#: g10/pkclist.c:601
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
+
+#: g10/pkclist.c:602
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         Semn�tura este probabil un FALS.\n"
+
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
+"�ncredere!\n"
+
+#: g10/pkclist.c:612
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: s�rit�: %s\n"
+
+#: g10/pkclist.c:787 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
+
+#: g10/pkclist.c:829
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+"\n"
+"Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
+
+#: g10/pkclist.c:887
+msgid "No such user ID.\n"
+msgstr "Nu exist� acest ID utilizator.\n"
+
+#: g10/pkclist.c:892 g10/pkclist.c:954
+msgid "skipped: public key already set as default recipient\n"
+msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
+
+#: g10/pkclist.c:910
+msgid "Public key is disabled.\n"
+msgstr "Cheia public� este deactivat�.\n"
+
+#: g10/pkclist.c:917
+msgid "skipped: public key already set\n"
+msgstr "s�rit�: cheia public� setat� deja\n"
+
+#: g10/pkclist.c:946
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "destinatar implicit necunoscut `%s'\n"
+
+#: g10/pkclist.c:991
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: s�rit�: cheia public� este deactivat�\n"
+
+#: g10/pkclist.c:1046
+msgid "no valid addressees\n"
+msgstr "nici un destinatar valid\n"
+
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "preferin�a %c%lu duplicat�\n"
+
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "prea multe preferin�e `%c'\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "prea multe preferin�e `%c'\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "prea multe preferin�e `%c'\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "caracter invalid �n �ir preferin�e\n"
+
+#: g10/keygen.c:738
+msgid "writing direct signature\n"
+msgstr "scriu semn�tur� direct�\n"
+
+#: g10/keygen.c:777
+msgid "writing self signature\n"
+msgstr "scriu auto semn�tur�\n"
+
+#: g10/keygen.c:823
+msgid "writing key binding signature\n"
+msgstr "scriu semn�tur� legat� de cheie\n"
+
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
+
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "lungime cheie rotunjit� la %u bi�i\n"
+
+#: g10/keygen.c:1165
+msgid "Please select what kind of key you want:\n"
+msgstr "Selecta�i ce fel de cheie dori�i:\n"
+
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA �i ElGamal (implicit)\n"
+
+#: g10/keygen.c:1168
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (numai semn�tur�)\n"
+
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (numai cifrare)\n"
+
+#: g10/keygen.c:1171
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (numai semn�tur�)\n"
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (numai cifrare)\n"
+
+#: g10/keygen.c:1175
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (semn�tur� �i cifrare)\n"
+
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+msgid "Your selection? "
+msgstr "Selec�ia d-voastr�? "
+
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+msgid "Invalid selection.\n"
+msgstr "Selec�ie invalid�.\n"
+
+#: g10/keygen.c:1225
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Pe cale s� genera�i o nou� pereche de chei %s.\n"
+"              lungimea minim� este  768 bits\n"
+"           lungimea implicit� este 1024 bits\n"
+" cea mai lung� cheie sugerat� este 2048 bits\n"
+
+#: g10/keygen.c:1234
+msgid "What keysize do you want? (1024) "
+msgstr "Ce lungime de cheie dori�i? (1024) "
+
+#: g10/keygen.c:1239
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA permite numai chei de la 512 la 1024\n"
+
+#: g10/keygen.c:1241
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr ""
+"lungime cheie prea mic�; 1024 este cea mai mic� valoare permis� pentru RSA.\n"
+
+#: g10/keygen.c:1244
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "lungime cheie prea mic�; 768 este cea mai mic� valoare permis�.\n"
+
+#: g10/keygen.c:1255
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "lungime cheie prea mare; %d este cea mai mare valoare permis�.\n"
+
+#: g10/keygen.c:1260
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n"
+"deoarece calculele iau FOARTE MULT timp!\n"
+
+#: g10/keygen.c:1263
+msgid "Are you sure that you want this keysize? "
+msgstr "Sunte�i sigur(�) c� dori�i aceast� lungime de cheie?"
+
+#: g10/keygen.c:1264
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Bine, dar �ine�i minte c� radia�ia monitorului �i tastaturii d-voastr� este "
+"de asemenea vulnerabil� la atacuri!\n"
+
+#: g10/keygen.c:1273
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Lungimea cheii necesar� este %u bi�i\n"
+
+#: g10/keygen.c:1276 g10/keygen.c:1280
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rotunjit� prin adaos la %u bi�i\n"
+
+#: g10/keygen.c:1331
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+"Specifica�i c�t de mult timp dori�i s� fie valid� cheia.\n"
+"         0 = cheia nu expir�\n"
+"      <n>  = cheia expir� �n n zile\n"
+"      <n>w = cheia expir� �n n s�pt�m�ni\n"
+"      <n>m = cheia expir� �n n luni\n"
+"      <n>y = cheia expir� �n n ani\n"
+
+#: g10/keygen.c:1340
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"Specifica�i c�t de mult timp dori�i s� fie valid� semn�tura.\n"
+"         0 = semn�tura nu expir�\n"
+"      <n>  = semn�tura expir� �n n zile\n"
+"      <n>w = semn�tura expir� �n n s�pt�m�ni\n"
+"      <n>m = semn�tura expir� �n n luni\n"
+"      <n>y = semn�tura expir� �n n ani\n"
+
+#: g10/keygen.c:1362
+msgid "Key is valid for? (0) "
+msgstr "Cheia este valid� pentru? (0) "
+
+#: g10/keygen.c:1364
+msgid "Signature is valid for? (0) "
+msgstr "Semn�tura este valid� pentru? (0) "
+
+#: g10/keygen.c:1369
+msgid "invalid value\n"
+msgstr "valoare invalid�\n"
+
+#: g10/keygen.c:1374
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr "%s nu expir� deloc\n"
+
+#: g10/keygen.c:1381
+#, c-format
+msgid "%s expires at %s\n"
+msgstr "%s expir� la %s\n"
+
+#: g10/keygen.c:1387
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
+"Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
+
+#: g10/keygen.c:1392
+msgid "Is this correct (y/n)? "
+msgstr "Este aceasta corect (d/n)? "
+
+#: g10/keygen.c:1435
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"Ave�i nevoie de un ID utilizator pentru a identifica cheia; software-ul\n"
+"construie�te id-ul utilizator din Numele Real, Comentariu �i Adresa de "
+"Email\n"
+"�n aceast� form�:\n"
+"    \"Popa Ioan (popic�) <[email protected]>\"\n"
+"\n"
+
+#: g10/keygen.c:1447
+msgid "Real name: "
+msgstr "Nume real: "
+
+#: g10/keygen.c:1455
+msgid "Invalid character in name\n"
+msgstr "Caracter invalid �n nume\n"
+
+#: g10/keygen.c:1457
+msgid "Name may not start with a digit\n"
+msgstr "Numele nu poate �ncepe cu o cifr�\n"
+
+#: g10/keygen.c:1459
+msgid "Name must be at least 5 characters long\n"
+msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
+
+#: g10/keygen.c:1467
+msgid "Email address: "
+msgstr "Adres� de email: "
+
+#: g10/keygen.c:1478
+msgid "Not a valid email address\n"
+msgstr "Nu este o adres� de email valid�\n"
+
+#: g10/keygen.c:1486
+msgid "Comment: "
+msgstr "Comentariu: "
+
+#: g10/keygen.c:1492
+msgid "Invalid character in comment\n"
+msgstr "Caracter invalid �n comentariu\n"
+
+#: g10/keygen.c:1515
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "Folosi�i setul de caractere `%s'\n"
+
+#: g10/keygen.c:1521
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"A�i selectat acest ID-UTILIZATOR:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:1526
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
+
+#: g10/keygen.c:1531
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoTt"
+
+#: g10/keygen.c:1541
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
+
+#: g10/keygen.c:1542
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
+
+#: g10/keygen.c:1561
+msgid "Please correct the error first\n"
+msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
+
+#: g10/keygen.c:1600
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
+"\n"
+
+#: g10/keygen.c:1609 g10/keyedit.c:1021
+msgid "passphrase not correctly repeated; try again"
+msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
+
+#: g10/keygen.c:1610
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:1616
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway.  You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"Nu ave�i nevoie de o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
+"O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
+"program cu op�iunea \"--edit-key\".\n"
+
+#: g10/keygen.c:1638
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Trebuie s� gener�m o gr�mad� de octe�i aleatori. Este o idee bun� s� face�i\n"
+"altceva (tasta�i la tastatur�, mi�ca�i mausul, utiliza�i discurile)\n"
+"�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
+"numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
+
+#: g10/keygen.c:2267
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "Perechea de chei DSA va avea 1024 bi�i.\n"
+
+#: g10/keygen.c:2335
+msgid "Key generation canceled.\n"
+msgstr "Generarea cheii a fost anulat�.\n"
+
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "scriu cheia public� �n `%s'\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "scriu cheia secret� �n `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "scriu cheia secret� �n `%s'\n"
+
+#: g10/keygen.c:2565
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
+
+#: g10/keygen.c:2571
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
+
+#: g10/keygen.c:2589
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
+
+#: g10/keygen.c:2596
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
+
+#: g10/keygen.c:2619
+msgid "public and secret key created and signed.\n"
+msgstr "cheile secret� �i public� au fost create �i semnate.\n"
+
+#: g10/keygen.c:2630
+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 ""
+"De notat c� aceast� cheie nu poate fi folosit� pentru cifrare.  Poate "
+"dori�i\n"
+"s� folosi�i comanda \"--edit-key\" pentru a genera o cheie secundar� pentru\n"
+"acest scop.\n"
+
+#: g10/keygen.c:2642 g10/keygen.c:2755
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Generarea cheii a e�uat: %s\n"
+
+#: g10/keygen.c:2691 g10/sign.c:290
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
+"ceasul)\n"
+
+#: g10/keygen.c:2693 g10/sign.c:292
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
+"ceasul)\n"
+
+#: g10/keygen.c:2702
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
+
+#: g10/keygen.c:2730
+msgid "Really create? "
+msgstr "Crea�i �ntr-adev�r? "
+
+#: g10/decrypt.c:98 g10/encode.c:845
+msgid "--output doesn't work for this command\n"
+msgstr "--output nu merge pentru aceast� comand�\n"
+
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: nu pot deschide: %s\n"
+
+#: g10/encode.c:203 g10/sign.c:1144
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: g10/encode.c:208
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
+
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "folosesc cifrul %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "`%s' deja compresat\n"
+
+#: g10/encode.c:301 g10/encode.c:590
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: AVERTISMENT: fi�ier gol\n"
+
+#: g10/encode.c:465
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr ""
+"�n modul --pgp2 pute�i cifra numai cu chei RSA de 2048 bi�i sau mai pu�in\n"
+
+#: g10/encode.c:480
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "citesc din `%s'\n"
+
+#: g10/encode.c:516
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+"nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifra�i.\n"
+
+#: g10/encode.c:526 g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
+
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"for��nd algoritmul de compresie %s (%d) viola�i preferin�ele destinatarului\n"
+
+#: g10/encode.c:818
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s cifrat pentru: \"%s\"\n"
+
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "cheia `%s' nu a fost g�sit�: %s\n"
+
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "eroare la citire keyblock: %s\n"
+
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "cheia %08lX: nu e protejat� - s�rit�\n"
+
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "cheia %08lX: cheie stil PGP 2.x - s�rit�\n"
+
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "AVERTISMENT: cheia secret� %08lX nu are un checksum SK simplu\n"
+
+#: g10/export.c:385
+msgid "WARNING: nothing exported\n"
+msgstr "AVERTISMENT: nimic exportat\n"
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
+
+#: g10/getkey.c:186 g10/getkey.c:2693
+msgid "[User id not found]"
+msgstr "[ID utilizator nu a fost g�sit]"
+
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Cheia invalid� %08lX f�cut� valid� de --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "nici o subcheie secret� pentru subcheia public� %08lX - ignorat�\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "folosim cheia secundar� %08lX �n loc de cheia primar� %08lX\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "cheia %08lX: cheie secret� f�r� cheie public� - s�rit�\n"
+
+#: g10/import.c:241
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "bloc de tip %d s�rit\n"
+
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu chei procesate p�n� acum\n"
+
+#: g10/import.c:255
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: g10/import.c:267
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Num�r total procesate: %lu\n"
+
+#: g10/import.c:269
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "      chei noi s�rite: %lu\n"
+
+#: g10/import.c:272
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "  f�r� ID-uri utilizator: %lu\n"
+
+#: g10/import.c:274
+#, c-format
+msgid "              imported: %lu"
+msgstr "               importate: %lu"
+
+#: g10/import.c:280
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "             neschimbate: %lu\n"
+
+#: g10/import.c:282
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "   noi ID-uri utilizator: %lu\n"
+
+#: g10/import.c:284
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "             noi subchei: %lu\n"
+
+#: g10/import.c:286
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "           noi semn�turi: %lu\n"
+
+#: g10/import.c:288
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "    noi revoc�ri de chei: %lu\n"
+
+#: g10/import.c:290
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "     chei secrete citite: %lu\n"
+
+#: g10/import.c:292
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "  chei secrete importate: %lu\n"
+
+#: g10/import.c:294
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr "chei secrete neschimbate: %lu\n"
+
+#: g10/import.c:296
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr "            ne importate: %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "A�i semnat aceste ID-uri utilizator:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "cheia %08lX: nici un ID utilizator\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "cheia %08lX: subcheia HPK corupt� a fost reparat�\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "cheia %08lX: am acceptat ID-ul utilizator ce nu e auto-semnat '%s'\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "cheia %08lX: nici un ID utilizator valid\n"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "cheia %08lX: cheia public� nu a fost g�sit�: %s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "cheia %08lX: cheie nou� - s�rit�\n"
+
+#: g10/import.c:755
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
+
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "scriu �n `%s'\n"
+
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "cheia %08lX: cheia public� \"%s\" importat�\n"
+
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "cheia %08lX: nu se potrive�te cu copia noastr�\n"
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "cheia %08lX: nu pot g�si keyblock-ul original: %s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "cheia %08lX: nu pot citi keyblock-ul original: %s\n"
+
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "cheia %08lX: \"%s\" 1 nou ID utilizator\n"
+
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "cheia %08lX: \"%s\" %d noi ID-uri utilizator\n"
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "cheia %08lX: \"%s\" 1 nou� semn�tur�\n"
+
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "cheia %08lX: \"%s\" %d noi semn�turi\n"
+
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %08lX: \"%s\" 1 nou� subcheie\n"
+
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %08lX: \"%s\" %d noi subchei\n"
+
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %08lX: \"%s\" nu a fost schimbat�\n"
+
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %08lX: cheie secret� cu cifru invalid %d - s�rit�\n"
+
+#: g10/import.c:1064
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "nici un inel de chei secret implicit: %s\n"
+
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "cheia %08lX: cheie secret� importat�\n"
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "cheia %08lX: deja �n inelul de chei secret\n"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "cheia %08lX: cheia secret� nu a fost g�sit�: %s\n"
+
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr ""
+"cheia %08lX: nici o cheie public� - nu pot aplica certificatul de revocare\n"
+
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "cheia %08lX: certificat de revocare invalid: %s - respins\n"
+
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "cheia %08lX: certificatul de revocare \"%s\" importat\n"
+
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "cheia %08lX: nici un ID utilizator pentru semn�tur�\n"
+
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr ""
+"cheia %08lX: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%"
+"s\"\n"
+
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "cheia %08lX: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
+
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "cheia %08lX: nici o subcheie legat� de cheie\n"
+
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "cheia %08lX: algoritm cu cheie public� nesuportat\n"
+
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "cheia %08lX: leg�tur� subcheie invalid�\n"
+
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "cheia %08lX: am �ters multiple leg�turi de subchei\n"
+
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "cheia %08lX: nici o subcheie pentru revocarea cheii\n"
+
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "cheia %08lX: revocare de subcheie invalid�\n"
+
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "cheia %08lX: am �ters multiple revoc�ri de subcheie\n"
+
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "cheia %08lX: am s�rit ID-ul utilizator '"
+
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "cheia %08lX: am s�rit subcheia\n"
+
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "cheia %08lX: semn�tura nu poate fi exportat� (clasa %02x) - s�rit�\n"
+
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "cheia %08lX: certificat de revocare �ntr-un loc gre�it - s�rit\n"
+
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "cheia %08lX: certificat de revocare invalid: %s - s�rit\n"
+
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "cheia %08lX: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
+
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "cheia %08lX: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "cheia %08lX: am detectat un ID utilizator duplicat - combinate\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr ""
+"AVERTISMENT: cheia %08lX poate fi revocat�: aduc revocarea cheii %08lX\n"
+
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr ""
+"AVERTISMENT: cheia %08lX poate fi revocat�: cheia de revocare %08lX nu este "
+"prezent�.\n"
+
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "cheia %08lX: am ad�ugat certificatul de revocare \"%s\"\n"
+
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "cheia %08lX: am ad�ugat semn�tura de cheie direct�\n"
+
+#: g10/keyedit.c:159
+msgid "[revocation]"
+msgstr "[revocare]"
+
+#: g10/keyedit.c:160
+msgid "[self-signature]"
+msgstr "[auto-semn�tur�]"
+
+#: g10/keyedit.c:237 g10/keylist.c:319
+msgid "1 bad signature\n"
+msgstr "1 semn�tur� incorect�\n"
+
+#: g10/keyedit.c:239 g10/keylist.c:321
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d semn�turi incorecte\n"
+
+#: g10/keyedit.c:241 g10/keylist.c:323
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
+
+#: g10/keyedit.c:243 g10/keylist.c:325
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
+
+#: g10/keyedit.c:245 g10/keylist.c:327
+msgid "1 signature not checked due to an error\n"
+msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+
+#: g10/keyedit.c:247 g10/keylist.c:329
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
+
+#: g10/keyedit.c:249
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
+
+#: g10/keyedit.c:251
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Am o �ncredere marginal�\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Am toat� �ncrederea\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
+
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
+msgid "  Unable to sign.\n"
+msgstr "  Nu pot semna.\n"
+
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "ID utilizator \"%s\" este expirat."
+
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
+
+#: g10/keyedit.c:584
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Auto-semn�tura pe \"%s\"\n"
+"este o semn�tur� stil PGP 2.x.\n"
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Semn�tura d-voastr� curent� pe \"%s\"\n"
+"a expirat.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
+
+#: g10/keyedit.c:632
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"Semn�tura d-voastr� curent� pe \"%s\"\n"
+"semn�tur� local�.\n"
+
+#: g10/keyedit.c:636
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
+
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" a fost deja semnat� local de cheia %08lX\n"
+
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" a fost deja semnat� de cheia %08lX\n"
+
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nimic de semnat cu cheia %08lX\n"
+
+#: g10/keyedit.c:702
+msgid "This key has expired!"
+msgstr "Aceast� cheie a expirat!"
+
+#: g10/keyedit.c:722
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "Aceast� cheie va expira pe %s.\n"
+
+#: g10/keyedit.c:726
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
+
+#: g10/keyedit.c:759
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
+"modul --pgp2.\n"
+
+#: g10/keyedit.c:761
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
+
+#: g10/keyedit.c:786
+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 ""
+"C�t de atent a�i verificat c� cheia pe care sunte�i pe cale a o semna "
+"apar�ine\n"
+"�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
+"introduce�i \"0\".\n"
+
+#: g10/keyedit.c:791
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr "   (0) Nu voi r�spunde.%s\n"
+
+#: g10/keyedit.c:793
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr "   (1) Nu am verificat deloc.%s\n"
+
+#: g10/keyedit.c:795
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
+
+#: g10/keyedit.c:797
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Selec�ia dvs.? (introduce�i '?' pentru informa�ii suplimentare): "
+
+#: g10/keyedit.c:826
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
+"aceast� cheie cu cheia d-voastr�: \""
+
+#: g10/keyedit.c:835
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"\n"
+"Aceasta va fi o auto-semn�tur�.\n"
+
+#: g10/keyedit.c:839
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
+
+#: g10/keyedit.c:844
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
+
+#: g10/keyedit.c:851
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Semn�tura va fi marcat� ca non-exportabil�.\n"
+
+#: g10/keyedit.c:855
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Semn�tura va fi marcat� ca non-revocabil�.\n"
+
+#: g10/keyedit.c:860
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+"\n"
+"Nu am verificat aceast� cheie deloc.\n"
+
+#: g10/keyedit.c:864
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+"\n"
+"Am verificat aceast� cheie superficial.\n"
+
+#: g10/keyedit.c:868
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+"\n"
+"Am verificat aceast� cheie foarte atent.\n"
+
+#: g10/keyedit.c:877
+msgid "Really sign? "
+msgstr "Dori�i cu adev�rat s� semna�i?"
+
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "semnarea a e�uat: %s\n"
+
+#: g10/keyedit.c:978
+msgid "This key is not protected.\n"
+msgstr "Aceast� cheie nu este protejat�.\n"
+
+#: g10/keyedit.c:982
+msgid "Secret parts of primary key are not available.\n"
+msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
+
+#: g10/keyedit.c:986
+msgid "Key is protected.\n"
+msgstr "Cheia este protejat�.\n"
+
+#: g10/keyedit.c:1006
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Nu pot edita aceast� cheie: %s\n"
+
+#: g10/keyedit.c:1012
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
+"\n"
+
+#: g10/keyedit.c:1026
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
+"\n"
+
+#: g10/keyedit.c:1029
+msgid "Do you really want to do this? "
+msgstr "Dori�i �ntr-adev�r s� face�i acest lucru?"
+
+#: g10/keyedit.c:1095
+msgid "moving a key signature to the correct place\n"
+msgstr "mut o semn�tur� de cheie �n locul corect\n"
+
+#: g10/keyedit.c:1138
+msgid "quit this menu"
+msgstr "ie�i din acest meniu"
+
+#: g10/keyedit.c:1139
+msgid "q"
+msgstr "t"
+
+#: g10/keyedit.c:1140
+msgid "save"
+msgstr "salveaz�"
+
+#: g10/keyedit.c:1140
+msgid "save and quit"
+msgstr "salveaz� �i termin�"
+
+#: g10/keyedit.c:1141
+msgid "help"
+msgstr "ajutor"
+
+#: g10/keyedit.c:1141
+msgid "show this help"
+msgstr "afi�eaz� acest mesaj"
+
+#: g10/keyedit.c:1143
+msgid "fpr"
+msgstr "ampr"
+
+#: g10/keyedit.c:1143
+msgid "show fingerprint"
+msgstr "afi�eaz� amprenta"
+
+#: g10/keyedit.c:1144
+msgid "list"
+msgstr "enumer�"
+
+#: g10/keyedit.c:1144
+msgid "list key and user IDs"
+msgstr "enumer� chei �i ID-uri utilizator"
+
+#: g10/keyedit.c:1145
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:1146
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:1146
+msgid "select user ID N"
+msgstr "selecteaz� ID utilizator N"
+
+#: g10/keyedit.c:1147
+msgid "key"
+msgstr "cheie"
+
+#: g10/keyedit.c:1147
+msgid "select secondary key N"
+msgstr "selecteaz� cheie secundar� N"
+
+#: g10/keyedit.c:1148
+msgid "check"
+msgstr "verific�"
+
+#: g10/keyedit.c:1148
+msgid "list signatures"
+msgstr "enumer� semn�turi"
+
+#: g10/keyedit.c:1149
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:1150
+msgid "sign"
+msgstr "semneaz�"
+
+#: g10/keyedit.c:1150
+msgid "sign the key"
+msgstr "semneaz� cheia"
+
+#: g10/keyedit.c:1151
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "semneaz�"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "creaz� o semn�tur� deta�at�"
+
+#: g10/keyedit.c:1153
+msgid "lsign"
+msgstr "semloc"
+
+#: g10/keyedit.c:1153
+msgid "sign the key locally"
+msgstr "semneaz� cheia local"
+
+#: g10/keyedit.c:1154
+msgid "nrsign"
+msgstr "semirev"
+
+#: g10/keyedit.c:1154
+msgid "sign the key non-revocably"
+msgstr "semneaz� cheia irevocabil"
+
+#: g10/keyedit.c:1155
+msgid "nrlsign"
+msgstr "semlirev"
+
+#: g10/keyedit.c:1155
+msgid "sign the key locally and non-revocably"
+msgstr "semneaz� cheia local �i irevocabil"
+
+#: g10/keyedit.c:1156
+msgid "debug"
+msgstr "depanare"
+
+#: g10/keyedit.c:1157
+msgid "adduid"
+msgstr "adauid"
+
+#: g10/keyedit.c:1157
+msgid "add a user ID"
+msgstr "adaug� un ID utilizator"
+
+#: g10/keyedit.c:1158
+msgid "addphoto"
+msgstr "adapoza"
+
+#: g10/keyedit.c:1158
+msgid "add a photo ID"
+msgstr "adaug� o poz� ID"
+
+#: g10/keyedit.c:1159
+msgid "deluid"
+msgstr "steuid"
+
+#: g10/keyedit.c:1159
+msgid "delete user ID"
+msgstr "�terge ID utilizator"
+
+#: g10/keyedit.c:1161
+msgid "delphoto"
+msgstr "stepoza"
+
+#: g10/keyedit.c:1162
+msgid "addkey"
+msgstr "adacheie"
+
+#: g10/keyedit.c:1162
+msgid "add a secondary key"
+msgstr "adaug� o cheie secundar�"
+
+#: g10/keyedit.c:1163
+msgid "delkey"
+msgstr "stecheie"
+
+#: g10/keyedit.c:1163
+msgid "delete a secondary key"
+msgstr "�terge o cheie secundar�"
+
+#: g10/keyedit.c:1164
+msgid "addrevoker"
+msgstr "adarev"
+
+#: g10/keyedit.c:1164
+msgid "add a revocation key"
+msgstr "adaug� o cheie de revocare"
+
+#: g10/keyedit.c:1165
+msgid "delsig"
+msgstr "stesem"
+
+#: g10/keyedit.c:1165
+msgid "delete signatures"
+msgstr "�terge semn�turi"
+
+#: g10/keyedit.c:1166
+msgid "expire"
+msgstr "expira"
+
+#: g10/keyedit.c:1166
+msgid "change the expire date"
+msgstr "schimb� data de expirare"
+
+#: g10/keyedit.c:1167
+msgid "primary"
+msgstr "primar"
+
+#: g10/keyedit.c:1167
+msgid "flag user ID as primary"
+msgstr "marcheaz� ID-ul utilizator ca primar"
+
+#: g10/keyedit.c:1168
+msgid "toggle"
+msgstr "comuta"
+
+#: g10/keyedit.c:1168
+msgid "toggle between secret and public key listing"
+msgstr "comut� �ntre listele de chei secrete �i publice"
+
+#: g10/keyedit.c:1170
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:1171
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:1171
+msgid "list preferences (expert)"
+msgstr "enumer� preferin�ele (expert)"
+
+#: g10/keyedit.c:1172
+msgid "showpref"
+msgstr "afispref"
+
+#: g10/keyedit.c:1172
+msgid "list preferences (verbose)"
+msgstr "afi�eaz� preferin�ele (detaliat)"
+
+#: g10/keyedit.c:1173
+msgid "setpref"
+msgstr "setpref"
+
+#: g10/keyedit.c:1173
+msgid "set preference list"
+msgstr "seteaz� lista de preferin�e"
+
+#: g10/keyedit.c:1174
+msgid "updpref"
+msgstr "actpref"
+
+#: g10/keyedit.c:1174
+msgid "updated preferences"
+msgstr "preferin�e actualizate"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "eroare server de chei"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "nu am putut interpreta URI pentru serverul de chei\n"
+
+#: g10/keyedit.c:1176
+msgid "passwd"
+msgstr "parola"
+
+#: g10/keyedit.c:1176
+msgid "change the passphrase"
+msgstr "schimb� fraza-parol�"
+
+#: g10/keyedit.c:1177
+msgid "trust"
+msgstr "incred"
+
+#: g10/keyedit.c:1177
+msgid "change the ownertrust"
+msgstr "schimb� �ncrederea pentru proprietar"
+
+#: g10/keyedit.c:1178
+msgid "revsig"
+msgstr "revsem"
+
+#: g10/keyedit.c:1178
+msgid "revoke signatures"
+msgstr "revoc� semn�turi"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "revoc� un ID utilizator"
+
+#: g10/keyedit.c:1180
+msgid "revkey"
+msgstr "revcheie"
+
+#: g10/keyedit.c:1180
+msgid "revoke a secondary key"
+msgstr "revoc� o cheie secundar�"
+
+#: g10/keyedit.c:1181
+msgid "disable"
+msgstr "deact"
+
+#: g10/keyedit.c:1181
+msgid "disable a key"
+msgstr "deactiveaz� o cheie"
+
+#: g10/keyedit.c:1182
+msgid "enable"
+msgstr "activ"
+
+#: g10/keyedit.c:1182
+msgid "enable a key"
+msgstr "activeaz� o cheie"
+
+#: g10/keyedit.c:1183
+msgid "showphoto"
+msgstr "afispoza"
+
+#: g10/keyedit.c:1183
+msgid "show photo ID"
+msgstr "arat� o poz� ID"
+
+#: g10/keyedit.c:1202 g10/delkey.c:120
+msgid "can't do that in batchmode\n"
+msgstr "nu pot face acest lucru �n modul batch\n"
+
+#: g10/keyedit.c:1233
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "eroare la citire keyblock secret `%s': %s\n"
+
+#: g10/keyedit.c:1250
+msgid "Secret key is available.\n"
+msgstr "Cheia secret� este disponibil�.\n"
+
+#: g10/keyedit.c:1282
+msgid "Command> "
+msgstr "Comand�> "
+
+#: g10/keyedit.c:1312
+msgid "Need the secret key to do this.\n"
+msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
+
+#: g10/keyedit.c:1316
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
+
+#: g10/keyedit.c:1364
+msgid "Key is revoked."
+msgstr "Cheia este revocat�."
+
+#: g10/keyedit.c:1383
+msgid "Really sign all user IDs? "
+msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? "
+
+#: g10/keyedit.c:1384
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
+
+#: g10/keyedit.c:1409
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
+
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+msgid "You must select at least one user ID.\n"
+msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
+
+#: g10/keyedit.c:1433
+msgid "You can't delete the last user ID!\n"
+msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
+
+#: g10/keyedit.c:1436
+msgid "Really remove all selected user IDs? "
+msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? "
+
+#: g10/keyedit.c:1437
+msgid "Really remove this user ID? "
+msgstr "�terge�i �ntr-adev�r acest ID utilizator? "
+
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
+msgid "You must select at least one key.\n"
+msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
+
+#: g10/keyedit.c:1478
+msgid "Do you really want to delete the selected keys? "
+msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? "
+
+#: g10/keyedit.c:1479
+msgid "Do you really want to delete this key? "
+msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? "
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? "
+
+#: g10/keyedit.c:1534
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i cheile selectate? "
+
+#: g10/keyedit.c:1535
+msgid "Do you really want to revoke this key? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "seteaz� lista de preferin�e"
+
+#: g10/keyedit.c:1612
+msgid "Really update the preferences for the selected user IDs? "
+msgstr ""
+"Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
+"selectate? "
+
+#: g10/keyedit.c:1614
+msgid "Really update the preferences? "
+msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? "
+
+#: g10/keyedit.c:1662
+msgid "Save changes? "
+msgstr "Salva�i schimb�rile? "
+
+#: g10/keyedit.c:1665
+msgid "Quit without saving? "
+msgstr "Termina�i f�r� a salva? "
+
+#: g10/keyedit.c:1675
+#, c-format
+msgid "update failed: %s\n"
+msgstr "actualizarea a e�uat: %s\n"
+
+#: g10/keyedit.c:1682
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "actualizarea secretului a e�uat: %s\n"
+
+#: g10/keyedit.c:1689
+msgid "Key not changed so no update needed.\n"
+msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
+
+#: g10/keyedit.c:1701
+msgid "Invalid command  (try \"help\")\n"
+msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Rezumat: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Capabilit��i: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr "Aceast� cheie poate fi revocat� de cheia %s "
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr " (senzitiv)"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "nu pot crea %s: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revocat�] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [expir�: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [expir�: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " �ncredere: %c/%c"
+
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
+msgid "This key has been disabled"
+msgstr "Aceast� cheie a fost deactivat�"
+
+#: g10/keyedit.c:2146
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! subcheia a fost revocat�: %s\n"
+
+#: g10/keyedit.c:2149
+msgid "rev- faked revocation found\n"
+msgstr "rev- a fost g�sit� o revocare falsificat�\n"
+
+#: g10/keyedit.c:2151
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? probleme la verificare revoc�rii: %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revocat�] "
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expira"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
+
+#: g10/keyedit.c:2207
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"V� rug�m observa�i c� validitatea cheii ar�tate nu este �n mod necesar\n"
+"corect� dac� nu reporni�i programul.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revocat�] "
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[expirat�] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"AVERTISMENT: nici un ID utilizator nu a fost marcat ca primar.\n"
+"              Aceast� comand� poate cauza ca un alt ID utilizator\n"
+"              s� devin� ID-ul utilizator primar presupus.\n"
+
+#: g10/keyedit.c:2399
+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 ""
+"AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
+"         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
+
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
+
+#: g10/keyedit.c:2410
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
+
+#: g10/keyedit.c:2545
+msgid "Delete this good signature? (y/N/q)"
+msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
+
+#: g10/keyedit.c:2555
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
+
+#: g10/keyedit.c:2559
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
+
+#: g10/keyedit.c:2565
+msgid "Really delete this self-signature? (y/N)"
+msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
+
+#: g10/keyedit.c:2579
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Am �ters %d semn�tur�.\n"
+
+#: g10/keyedit.c:2580
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Am �ters %d semn�turi.\n"
+
+#: g10/keyedit.c:2583
+msgid "Nothing deleted.\n"
+msgstr "Nu am �ters nimic.\n"
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"AVERTISMENT: Aceasta este o cheie stil PGP 2.x.  Ad�ugarea unui "
+"revocator          desemnat poate face ca unele versiuni de PGP s� resping� "
+"cheia.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
+
+#: g10/keyedit.c:2703
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
+
+#: g10/keyedit.c:2726
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
+
+#: g10/keyedit.c:2741
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+"AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
+"anulat�!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i revocator "
+"desemnat? (d/N): "
+
+#: g10/keyedit.c:2849
+msgid "Please remove selections from the secret keys.\n"
+msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
+
+#: g10/keyedit.c:2855
+msgid "Please select at most one secondary key.\n"
+msgstr "V� rug�m selecta�i cel mult o cheie secundar�.\n"
+
+#: g10/keyedit.c:2859
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Schimbarea timpului de expirare pentru o cheie secundar�.\n"
+
+#: g10/keyedit.c:2862
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Schimbarea timpului de expirare pentru o cheie primar�.\n"
+
+#: g10/keyedit.c:2908
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
+
+#: g10/keyedit.c:2924
+msgid "No corresponding signature in secret ring\n"
+msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
+
+#: g10/keyedit.c:3004
+msgid "Please select exactly one user ID.\n"
+msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
+
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "auto-semn�turi v3 s�rite pentru ID-ul utilizator \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "Nici un ID utilizator cu indicele %d\n"
+
+#: g10/keyedit.c:3377
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "Nici o cheie secundar� cu indicele %d\n"
+
+#: g10/keyedit.c:3491
+msgid "user ID: \""
+msgstr "ID utilizator: \""
+
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"semnat� cu cheie d-voastr� %08lX la %s\n"
+
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"semnat� local cu cheie d-voastr� %08lX la %s\n"
+
+#: g10/keyedit.c:3504
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "Aceast� semn�tur� a expirat pe %s.\n"
+
+#: g10/keyedit.c:3508
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
+
+#: g10/keyedit.c:3512
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
+
+#: g10/keyedit.c:3537
+msgid "You have signed these user IDs:\n"
+msgstr "A�i semnat aceste ID-uri utilizator:\n"
+
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   semnat� de %08lX la %s%s%s\n"
+
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   revocat de %08lX la %s\n"
+
+#: g10/keyedit.c:3587
+msgid "You are about to revoke these signatures:\n"
+msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
+
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr "   semnat� de %08lX la %s%s\n"
+
+#: g10/keyedit.c:3599
+msgid " (non-exportable)"
+msgstr " (non-exportabil�)"
+
+#: g10/keyedit.c:3606
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
+
+#: g10/keyedit.c:3636
+msgid "no secret key\n"
+msgstr "nici o cheie secret�\n"
+
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+"AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:179
+msgid "Critical signature policy: "
+msgstr "Politic� de semn�turi critic�: "
+
+#: g10/keylist.c:181
+msgid "Signature policy: "
+msgstr "Politic� de semn�turi: "
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
+msgid "WARNING: invalid notation data found\n"
+msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
+
+#: g10/keylist.c:286
+msgid "Critical signature notation: "
+msgstr "Notare semn�tur� critic�: "
+
+#: g10/keylist.c:288
+msgid "Signature notation: "
+msgstr "Notare semn�tur�: "
+
+#: g10/keylist.c:299
+msgid "not human readable"
+msgstr "ilizibil"
+
+#: g10/keylist.c:400
+msgid "Keyring"
+msgstr "Inel de chei"
+
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [expir�: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
+msgid " [expires: %s]"
+msgstr " [expir�: %s]"
+
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revocat�] "
+
+#: g10/keylist.c:1357
+msgid "Primary key fingerprint:"
+msgstr "Amprent� cheie primar�:"
+
+#: g10/keylist.c:1359
+msgid "     Subkey fingerprint:"
+msgstr "     Amprent� subcheie:"
+
+#: g10/keylist.c:1366
+msgid " Primary key fingerprint:"
+msgstr " Amprent� cheie primar�:"
+
+#: g10/keylist.c:1368
+msgid "      Subkey fingerprint:"
+msgstr "      Amprent� subcheie:"
+
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr "     Amprent� cheie ="
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
+
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "fraz�=parol� gre�it� sau algoritm cifrare necunoscut (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s cheie de sesiune cifrat�\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s date cifrate\n"
+
+#: g10/mainproc.c:305 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "cifrat cu un algoritm necunoscut %d\n"
+
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "cifrat cu un algoritm necunoscut %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "cheia public� este %08lX\n"
+
+#: g10/mainproc.c:428
+msgid "public key encrypted data: good DEK\n"
+msgstr "date cigrate cu cheie public�: DEK bun\n"
+
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "cifrat cu cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s\n"
+
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "cifrat cu cheia %s, ID %08lX\n"
+
+#: g10/mainproc.c:486
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "decriptarea cu cheie public� a e�uat: %s\n"
+
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "cifrat� cu %lu fraze-parol�\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "cifrat� cu 1 fraz�-parol�\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "presupunem date cifrate %s\n"
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
+
+#: g10/mainproc.c:570
+msgid "decryption okay\n"
+msgstr "decriptare OK\n"
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
+
+#: g10/mainproc.c:587
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
+
+#: g10/mainproc.c:593
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decriptarea a e�uat: %s\n"
+
+#: g10/mainproc.c:613
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
+
+#: g10/mainproc.c:615
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "nume fi�ier original='%.*s'\n"
+
+#: g10/mainproc.c:787
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
+
+#: g10/mainproc.c:1283
+msgid "signature verification suppressed\n"
+msgstr "verificare semn�tur� eliminat�\n"
+
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
+msgid "can't handle these multiple signatures\n"
+msgstr "nu pot m�nui aceste semn�turi multiple\n"
+
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Semn�tur� expirat� %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                aka \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Semn�tur� f�cut� %.*s folosind cheia %s cu ID %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Cheie disponibil� la: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr "Semn�tur� INCORECT� din \""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
+msgid "Expired signature from \""
+msgstr "Semn�tur� expirat� din \""
+
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
+msgid "Good signature from \""
+msgstr "Semn�tur� bun� din \""
+
+#: g10/mainproc.c:1510
+msgid "[uncertain]"
+msgstr "[nesigur]"
+
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                aka \""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Semn�tur� expirat� %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Semn�tura expir� %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "binar"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "modtext"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "necunoscut"
+
+#: g10/mainproc.c:1668
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Nu pot verifica semn�tura: %s\n"
+
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
+msgid "not a detached signature\n"
+msgstr "nu o semn�tur� deta�at�\n"
+
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+"AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
+
+#: g10/mainproc.c:1787
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "semn�tur� standalone de clas� 0x%02x\n"
+
+#: g10/mainproc.c:1844
+msgid "old style (PGP 2.x) signature\n"
+msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
+
+#: g10/mainproc.c:1854
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "pachet root invalid detectat �n proc_tree()\n"
+
+#: g10/misc.c:82
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
+
+#: g10/misc.c:146
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Algoritme experimentale nu ar trebui folosite!\n"
+
+#: g10/misc.c:176
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+"acest algoritm de cifrare este �nvechit; v� rug�m folosi�i unul standard!\n"
+
+#: g10/misc.c:282
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "plugin-ul cu cifrul IDEA nu este prezent\n"
+
+#: g10/misc.c:283
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"vede�i http://www.gnupg.org/why-not-idea.html pentru informa�ii "
+"suplimentare\n"
+
+#: g10/misc.c:491
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
+
+#: g10/misc.c:495
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
+#: g10/misc.c:497
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Necompresat"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Necompresat"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "citesc op�iuni din `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "destinatar implicit necunoscut `%s'\n"
+
+#: g10/parse-packet.c:120
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
+"(insecure)\n"
+
+#: g10/parse-packet.c:1128
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "subpachetul de tip %d are bitul critic setat\n"
+
+#: g10/passphrase.c:461 g10/passphrase.c:508
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+
+#: g10/passphrase.c:469
+msgid "can't set client pid for the agent\n"
+msgstr "nu pot seta pid-ul client pentru agent\n"
+
+#: g10/passphrase.c:477
+msgid "can't get server read FD for the agent\n"
+msgstr "nu pot convinge serverul s� citeasc� FD pentru agent\n"
+
+#: g10/passphrase.c:484
+msgid "can't get server write FD for the agent\n"
+msgstr "nu pot convinge serverul s� scrie FD pentru agent\n"
+
+#: g10/passphrase.c:517
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
+
+#: g10/passphrase.c:530
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent versiune protocol %d nu este suportat\n"
+
+#: g10/passphrase.c:551
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "nu m� pot conecta la `%s': %s\n"
+
+#: g10/passphrase.c:573
+msgid "communication problem with gpg-agent\n"
+msgstr "probleme de comunicare cu gpg-agent\n"
+
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+msgid "problem with the agent - disabling agent use\n"
+msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
+
+#: g10/passphrase.c:681
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (ID cheie principal� %08lX)"
+
+#: g10/passphrase.c:691
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru "
+"utilizator:\n"
+"\"%.*s\"\n"
+"%u-bit cheia %s, ID %08lX, creat� %s%s\n"
+
+#: g10/passphrase.c:713
+msgid "Repeat passphrase\n"
+msgstr "Repeta�i fraza-parol�\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Introduce�i fraza-parol�\n"
+
+#: g10/passphrase.c:753
+msgid "passphrase too long\n"
+msgstr "fraz�-parol� prea lung�\n"
+
+#: g10/passphrase.c:766
+msgid "invalid response from agent\n"
+msgstr "r�spuns invalid de la agent\n"
+
+#: g10/passphrase.c:781 g10/passphrase.c:874
+msgid "cancelled by user\n"
+msgstr "anulat� de utilizator\n"
+
+#: g10/passphrase.c:786 g10/passphrase.c:963
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "nu pot cere parola �n modul batch\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Introduce�i fraza-parol�: "
+
+#: g10/passphrase.c:1131
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia\n"
+"secret� pentru utilizator: \""
+
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s"
+
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (ID cheie principal� %08lX)"
+
+#: g10/passphrase.c:1213
+msgid "Repeat passphrase: "
+msgstr "Repeta�i fraza-parol�: "
+
+#: g10/plaintext.c:90
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr ""
+"datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
+
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "eroare la creearea `%s': %s\n"
+
+#: g10/plaintext.c:438
+msgid "Detached signature.\n"
+msgstr "Semn�tur� deta�at�.\n"
+
+#: g10/plaintext.c:442
+msgid "Please enter name of data file: "
+msgstr "V� rug�m introduce�i numele fi�ierului de date: "
+
+#: g10/plaintext.c:463
+msgid "reading stdin ...\n"
+msgstr "citesc stdin ...\n"
+
+#: g10/plaintext.c:497
+msgid "no signed data\n"
+msgstr "nici o dat� semnat�\n"
+
+#: g10/plaintext.c:505
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "nu pot deschide date semnate `%s'\n"
+
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "destinator anonim; �ncerc cheia secret� %08lX ...\n"
+
+#: g10/pubkey-enc.c:119
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "OK, noi suntem destinatarul anonim.\n"
+
+#: g10/pubkey-enc.c:207
+msgid "old encoding of the DEK is not supported\n"
+msgstr "vechea encodare a lui DEK nu este suportat�\n"
+
+#: g10/pubkey-enc.c:228
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
+
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "NOT�: algoritm cifrare %d nu a fost g�sit �n preferin�e\n"
+
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "NOT�: cheia secret� %08lX a expirat la %s\n"
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "NOT�: cheia a fost revocat�"
+
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
+
+#: g10/seckey-cert.c:60
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+
+#: g10/seckey-cert.c:250
+msgid "Invalid passphrase; please try again"
+msgstr "Fraz�-parol� invalid�; v� rug�m mai �ncerca�i o dat�"
+
+#: g10/seckey-cert.c:251
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:311
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr ""
+"AVERTISMENT: Cheie slab� detectat� - v� rug�m schimba�i din nou fraza-"
+"parol�.\n"
+
+#: g10/seckey-cert.c:349
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr "generez �nvechitul checksum de 16-bit pentru protec�ia cheii secrete\n"
+
+#: g10/sig-check.c:75
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
+
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr ""
+"AVERTISMENT: subcheia de semnare %08lX nu este certificat� reciproc (cross-"
+"certified)\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr ""
+"AVERTISMENT: subcheia de semnare %08lX are un certificare-reciproc� invalid� "
+"(invalid cross-certification)\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "cheie public� %08lX este mai nou� cu %lu secund� dec�t semn�tura\n"
+
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "cheie public� %08lX este mai nou� cu %lu secunde dec�t semn�tura\n"
+
+#: g10/sig-check.c:180
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
+"ceasul)\n"
+
+#: g10/sig-check.c:182
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
+"ceasul)\n"
+
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "NOT�: cheia semn�turii %08lX a expirat %s\n"
+
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"presupun semn�tur� incorect� din cheia %08lX datorit� unui bit critic "
+"necunoscut\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "cheia %08lX: nici o subcheie pentru pachetul de revocare a subcheii\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "cheia %08lX: nici o subcheie pentru semnare legat� de cheie\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "nu pot pune date notare �n semn�turi de chei v3 (stil PGP 2.x)\n"
+
+#: g10/sign.c:112
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"AVERTISMENT: nu pot %%-expanda notarea (prea mare).  Folosesc neexpandat.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "nu pot pune un URL de politic� �n semn�turi v3 (stil PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+"nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"AVERTISMENT: nu pot %%-expanda url-ul de politic� (prea mare).  Folosesc "
+"neexpandat.\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"AVERTISMENT: nu pot %%-expanda url-ul de politic� (prea mare).  Folosesc "
+"neexpandat.\n"
+
+#: g10/sign.c:364
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "verificarea semn�turii create a e�uat: %s\n"
+
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s semn�tur� de la: \"%s\"\n"
+
+#: g10/sign.c:550
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
+
+#: g10/sign.c:741
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
+
+#: g10/sign.c:765 g10/sign.c:1001
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "nu pot crea %s: %s\n"
+
+#: g10/sign.c:794
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"for�area algoritmului rezumat %s (%d) violeaz� preferin�ele destinatarului\n"
+
+#: g10/sign.c:886
+msgid "signing:"
+msgstr "semnare:"
+
+#: g10/sign.c:985
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
+
+#: g10/sign.c:1138
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "va fi folosit� cifrarea %s\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "nu pot m�nui linii de text mai lungi de %d caractere\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "linii de intrare mai lungi de %d caractere\n"
+
+#: g10/tdbio.c:128 g10/tdbio.c:1434
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
+
+#: g10/tdbio.c:134 g10/tdbio.c:1441
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr "tranzac�ia trustdb prea mare\n"
+
+#: g10/tdbio.c:497
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: nu pot accesa: %s\n"
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directorul nu exist�!\n"
+
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: nu pot crea �ncuietoare(lock)\n"
+
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: nu pot crea �ncuietoare(lock)\n"
+
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: nu pot crea: %s\n"
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
+
+#: g10/tdbio.c:549
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: a fost creat trustdb invalid\n"
+
+#: g10/tdbio.c:552
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: a fost creat trustdb\n"
+
+#: g10/tdbio.c:592
+msgid "NOTE: trustdb not writable\n"
+msgstr "NOT�: nu poate fi scris �n trustdb\n"
+
+#: g10/tdbio.c:608
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: trustdb invalid\n"
+
+#: g10/tdbio.c:640
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: am e�uat s� creez hashtable: %s\n"
+
+#: g10/tdbio.c:648
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
+
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: eroare citire �nregistrare versiune: %s\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
+
+#: g10/tdbio.c:1163
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek a e�uat: %s\n"
+
+#: g10/tdbio.c:1171
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
+
+#: g10/tdbio.c:1192
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: nu e un fi�ier trustdb\n"
+
+#: g10/tdbio.c:1210
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: �nregistrare versiune cu recnum %lu\n"
+
+#: g10/tdbio.c:1215
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: versiune fi�ier invalid� %d\n"
+
+#: g10/tdbio.c:1400
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: eroare citire �nregistrare liber�: %s\n"
+
+#: g10/tdbio.c:1408
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+
+#: g10/tdbio.c:1418
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
+
+#: g10/tdbio.c:1448
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
+
+#: g10/tdbio.c:1493
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
+
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "cheia %08lX: acceptat� ca cheie valid�\n"
+
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "cheia %08lX apare de mai multe ori �n trustdb\n"
+
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "cheia %08lX: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
+
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "cheie marcat� ca av�nd �ncredere suprem�.\n"
+
+#: g10/trustdb.c:344
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "�nregistrare �ncredere %lu, tip req %d: citirea a e�uat: %s\n"
+
+#: g10/trustdb.c:350
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
+
+#: g10/trustdb.c:365 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
+
+#: g10/trustdb.c:380 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sincronizarea a e�uat: %s\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "niciodat�     "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
+msgid "no need for a trustdb check\n"
+msgstr "nu e nevoie de o verificare pentru trustdb\n"
+
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "urm�toarea verificare pentru trustdb programat� pe %s\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "nu e nevoie de o verificare pentru trustdb\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "nu e nevoie de o verificare pentru trustdb\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "cheia public� %08lX nu a fost g�sit�: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "v� rug�m face�i un --check-trustdb\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "verific trustdb\n"
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "cheia public� a cheii cu �ncredere suprem� %08lX nu a fost g�sit�\n"
+
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"semn�tura nu a putut fi verificat�.\n"
+"V� rug�m aminti�i-v� c� fi�ierul de semn�tur� (.sig sau .asc)\n"
+"ar trebui s� fie primul dat �n linia de comand�.\n"
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
+
+#: 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 "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
+
+#: g10/skclist.c:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "s�rit� `%s': duplicat�\n"
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "s�rit� `%s': %s\n"
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr "s�rit�: cheia secret� deja prezent�\n"
+
+#: g10/skclist.c:179
+#, fuzzy, c-format
+msgid ""
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"s�rit� `%s': aceasta este o cheie ElGamal generat� de PGP care nu e sigur� "
+"pentru semn�turi!\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "Fi�ierul `%s' exist�. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Suprascriu (d/N)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: sufix necunoscut\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Introduce�i un nou nume-fi�ier"
+
+#: g10/openfile.c:183
+msgid "writing to stdout\n"
+msgstr "scriu la stdout\n"
+
+#: g10/openfile.c:282
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "presupun date semnate �n `%s'\n"
+
+#: g10/openfile.c:349
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "fi�ier de configurare nou `%s' creat\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
+
+#: g10/openfile.c:380
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: nu pot crea director: %s\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: director creat\n"
+
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr "problem� cu m�nuirea pachetului cifrat\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "cheie slab� creat� - re�ncerc\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
+
+#: g10/seskey.c:210
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
+
+#: g10/delkey.c:121 g10/delkey.c:128
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
+
+#: g10/delkey.c:127
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "nu se poate face acest lucru �n mod batch f�r� \"--yes\"\n"
+
+#: g10/delkey.c:139
+msgid "Delete this key from the keyring? "
+msgstr "�terge�i aceast� cheie din inelul de chei? "
+
+#: g10/delkey.c:147
+msgid "This is a secret key! - really delete? "
+msgstr "Aceasta este o cheie secret�! - chiar o �terge�i? "
+
+#: g10/delkey.c:157
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "stergere keyblock a e�uat: %s\n"
+
+#: g10/delkey.c:167
+msgid "ownertrust information cleared\n"
+msgstr "informa�ii �ncredere-proprietar cur��ate\n"
+
+#: g10/delkey.c:195
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "exist� o cheie secret� pentru cheia public� \"%s\"!\n"
+
+#: g10/delkey.c:197
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr ""
+"folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
+"�nt�i.\n"
+
+#: g10/helptext.c:48
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Este sarcina d-voastr� s� atribui�i o valoare aici; aceast� valoare\n"
+"nu va fi niciodat� exportat� pentru o ter�� parte.  Trebuie s�\n"
+"implement�m re�eaua-de-�ncredere; aceasta nu are nimic �n comun cu\n"
+"certificatele-de-re�ea (create implicit)."
+
+#: g10/helptext.c:54
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"Pentru a construi Re�eaua-de-�ncredere, GnuPG trebuie s� �tie care chei\n"
+"au nivel de �ncredere suprem - acestea de obicei sunt cheile pentru care\n"
+"ave�i acces la cheia secret�.  R�spunde�i \"da\" pentru a seta\n"
+"aceast� cheie cu nivel de �ncredere suprem\n"
+
+#: g10/helptext.c:61
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr ""
+"Dac� dori�i oricum s� folosi�i aceast� cheie revocat�, r�spunde�i \"da\"."
+
+#: g10/helptext.c:65
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+"Dac� dori�i oricum s� folosi�i aceast� cheie f�r� �ncredere, r�spunde�i \"da"
+"\"."
+
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Introduce�i ID-ul utilizator al destinatarului mesajului."
+
+#: g10/helptext.c:73
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+
+#: g10/helptext.c:87
+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 ""
+"�n general nu este o idee bun� s� folosi�i aceea�i cheie �i pentru\n"
+"semnare �i pentru cifrare.  Acest algoritm ar trebui folosit numai\n"
+"�n anumite domenii.  V� rug�m consulta�i mai �nt�i un expert �n domeniu."
+
+#: g10/helptext.c:94
+msgid "Enter the size of the key"
+msgstr "Introduce�i lungimea cheii"
+
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
+msgid "Answer \"yes\" or \"no\""
+msgstr "R�spunde�i \"da\" sau \"nu\""
+
+#: g10/helptext.c:108
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Introduce�i valoarea cerut� precum a ar�tat la prompt.\n"
+"Este posibil s� introduce�i o dat� ISO (AAAA-LL-ZZ) dar nu ve�i\n"
+"ob�ine un r�spuns de eroare bun - �n loc sistemul �ncearc� s�\n"
+"interpreteze valoare dat� ca un interval."
+
+#: g10/helptext.c:120
+msgid "Enter the name of the key holder"
+msgstr "Introduce�i numele de�in�torului cheii"
+
+#: g10/helptext.c:125
+msgid "please enter an optional but highly suggested email address"
+msgstr "v� rug�m introduce�i o adres� de email (op�ional� dar recomandat�)"
+
+#: g10/helptext.c:129
+msgid "Please enter an optional comment"
+msgstr "V� rug�m introduce�i un comentriu op�ional"
+
+#: g10/helptext.c:134
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N  pentru a schimba numele.\n"
+"C  pentru a schimba comentariul.\n"
+"E  pentru a schimba adresa de email.\n"
+"O  pentru a continua cu generarea cheii.\n"
+"T  pentru a termina generarea cheii."
+
+#: g10/helptext.c:143
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr ""
+"R�spunde�i \"da\" (sau numai \"d\") dac� sunte�i OK s� genera�i subcheia."
+
+#: g10/helptext.c:151
+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"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"C�nd semna�i un ID utilizator pe o cheie ar trebui s� verifica�i mai �nt�i\n"
+"c� cheia apar�ine persoanei numite �n ID-ul utilizator.  Este util �i "
+"altora\n"
+"s� �tie c�t de atent a�i verificat acest lucru.\n"
+"\n"
+"\"0\" �nseamn� c� nu pretinde�i nimic despre c�t de atent a�i verificat "
+"cheia\n"
+"\"1\" �nseamn� c� crede�i c� cheia este a persoanei ce pretinde c� este\n"
+"    proprietarul ei, dar n-a�i putut, sau nu a�i verificat deloc cheia.\n"
+"    Aceasta este util� pentru verificare \"persona\", unde semna�i cheia\n"
+"    unui utilizator pseudonim.\n"
+"\n"
+"\"2\" �nseamn� c� a�i f�cut o verificare supericial� a cheii.  De exemplu,\n"
+"    aceasta ar putea �nsemna c� a�i verificat amprenta cheii �i a�i "
+"verificat\n"
+"    ID-ul utilizator de pe cheie cu un ID cu poz�.\n"
+"\n"
+"\"3\" �nseamn� c� a�i f�cut o verificare extensiv� a cheii.  De exemplu,\n"
+"    aceasta ar putea �nsemna c� a�i verificat amprenta cheii cu "
+"proprietarul\n"
+"    cheii �n persoan�, c� a�i verificat folosind un document dificil de\n"
+"    falsificat cu poz� (cum ar fi un pa�aport) c� numele proprietarului "
+"cheii\n"
+"    este acela�i cu numele ID-ului utilizator al cheii �i c� a�i verificat\n"
+"    (schimb�nd emailuri) c� adresa de email de pe cheie apar�ine "
+"proprietarului\n"
+"cheii.\n"
+"\n"
+"De notat c� exemplele date pentru nivelele 2 �i 3 ceva mai sus sunt *numai*\n"
+"exemple. La urma urmei, d-voastr� decide�i ce �nseamn� \"superficial\" �i\n"
+"\"extensiv\" pentru d-voastr� c�nd semna�i alte chei.\n"
+"\n"
+"Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
+
+#: g10/helptext.c:189
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "R�spunde�i \"da\" dac� dori�i s� semna�i TOATE ID-urile utilizator"
+
+#: g10/helptext.c:193
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"R�spunde�i \"da\" dac� �ntr-adev�r dori�i s� �terge�i acest ID utilizator.\n"
+"Toate certificatele sunt de asemenea pierdute!"
+
+#: g10/helptext.c:198
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "R�spunde�i \"da\" dac� este OK s� �terge�i subcheia"
+
+#: g10/helptext.c:203
+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 ""
+"Aceasta este o semn�tur� valid� pe cheie; �n mod normal n-ar trebui\n"
+"s� �terge�i aceast� semn�tur� pentru c� aceasta ar putea fi important�la "
+"stabilirea conexiunii de �ncredere la cheie sau alt� cheie certificat�\n"
+"de aceast� cheie."
+
+#: g10/helptext.c:208
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"Aceast� semn�tur� nu poate fi verificat� pentru c� nu ave�i cheia\n"
+"corespunz�toare.  Ar trebui s� am�na�i �tergerea sa p�n� �ti�i care\n"
+"cheie a fost folosit� pentru c� aceast� cheie de semnare ar putea\n"
+"constitui o conexiune de �ncredere spre o alt� cheie deja certificat�."
+
+#: g10/helptext.c:214
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+"Semn�tura nu este valid�.  Aceasta ar trebui �tears� de pe inelul\n"
+"d-voastr� de chei."
+
+#: g10/helptext.c:218
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"Aceasta este o semn�tur� care leag� ID-ul utilizator de cheie.\n"
+"De obicei nu este o idee bun� s� �terge�i o asemenea semn�tur�.\n"
+"De fapt, GnuPG ar putea s� nu mai poat� folosi aceast� cheie.\n"
+"A�a c� face�i acest lucru numai dac� aceast� auto-semn�tur� este\n"
+"dintr-o oarecare cauz� invalid� �i o a doua este disponibil�."
+
+#: g10/helptext.c:226
+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 ""
+"Schimba�i toate preferin�ele ale tuturor ID-urilor utilizator (sau doar\n"
+"cele selectate) conform cu lista curent� de preferin�e.  Timestamp-urile\n"
+"tuturor auto-semn�turilor afectate vor fi avansate cu o secund�.\n"
+
+#: g10/helptext.c:233
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr ""
+"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+
+#: g10/helptext.c:239
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr ""
+"V� rug�m repeta�i ultima fraz�-parol�, pentru a fi sigur(�) ce a�i tastat."
+
+#: g10/helptext.c:243
+msgid "Give the name of the file to which the signature applies"
+msgstr "Da�i numele fi�ierului la care se aplic� semn�tura"
+
+#: g10/helptext.c:248
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "R�spunde�i \"da\" dac� este OK s� suprascrie�i fi�ierul"
+
+#: g10/helptext.c:253
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"V� rug�m introduce�i un nou nume-fi�ier. Dac� doar ap�sa�i RETURN,\n"
+"va fi folosit fi�ierul implicit (ar�tat �n paranteze)."
+
+#: g10/helptext.c:259
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"Ar trebui s� specifica�i un motiv pentru certificare.  �n func�ie de\n"
+"context ave�i posibilitatea s� alege�i din aceast� list�:\n"
+"  \"Cheia a fost compromis�\"\n"
+"      Folosi�i aceast� op�iune dac� ave�i un motiv s� crede�i c� persoane\n"
+"      neautorizate au avut acces la cheia d-voastr� secret�.\n"
+"  \"Cheia este �nlocuit�\"\n"
+"      Folosi�i aceast� op�iune dac� �nlocui�i cheia cu una nou�.\n"
+"  \"Cheia nu mai este folosit�\"\n"
+"      Folosi�i aceast� op�iune dac� pensiona�i cheia.\n"
+"  \"ID-ul utilizator nu mai este valid\"\n"
+"      Folosi�i aceast� op�iune dac� ID-ul utilizator nu mai trebuie "
+"folosit;\n"
+"      de obicei folosit� pentru a marca o adres� de email ca invalid�.\n"
+
+#: g10/helptext.c:275
+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 ""
+"Dac� dori�i, pute�i introduce un text descriind de ce publica�i acest\n"
+"certificat de revocare.  V� rug�m fi�i concis.\n"
+"O linie goal� termin� textul.\n"
+
+#: g10/helptext.c:290
+msgid "No help available"
+msgstr "Nici un ajutor disponibil"
+
+#: g10/helptext.c:298
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Nici un disponibil disponibil pentru `%s'"
+
+#: g10/keydb.c:189
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#: g10/keydb.c:196
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "inelul de chei `%s' creat\n"
+
+#: g10/keydb.c:615
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
+
+#: g10/keyring.c:1236
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s este cel neschimbat\n"
+
+#: g10/keyring.c:1239
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s este cel nou\n"
+
+#: g10/keyring.c:1240
+msgid "Please fix this possible security flaw\n"
+msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
+
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "verific inelul de chei `%s'\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu chei verificate (%lu semn�turi)\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu chei verificate (%lu semn�turi)\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: inelul de chei creat\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Alege�i o imagine pentru a o folosi ca poz� ID.  Imaginea trebuie s� fie un\n"
+"fi�ier JPEG.  Aminti�i-v� c� imaginea este p�strat� �n cheia d-voastr� "
+"public�.\n"
+"Dac� folosi�i o imagine foarte larg�, cheia d-voastr� va deveni de asemenea\n"
+"foarte larg�!\n"
+"�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Nu pot deschide poza \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" nu este un fi�ier JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Este aceast� poz� corect� (d/N/t)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "nu pot afi�a poza ID!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "nu pot crea directorul `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"chemarea programelor externe sunt deactivate datorit� op�iunilor nesigure "
+"pentru permisiunile fi�ierului\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe "
+"externe\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "nu pot executa %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "eroare de sistem la chemarea programului extern: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "ie�ire nenatural� a programului extern\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "nu pot executa programul extern\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "nu pot citi r�spunsul programului extern: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "niciodat�     "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet a e�uat: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "cheia %08lX: nici un ID utilizator\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Pentru a fi revocat de:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Crea�i un certificat de revocare pentru aceast� cheie? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "Ie�ire �n armur� ASCII for�at�.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet a e�uat: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Certificat de revocare creat.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "nici o cheie de revocare g�sit� pentru `%s'\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "cheia secret� `%s' nu a fost g�sit�: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "nici o cheie public� corespunz�toare: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "algoritm de protec�ie necunoscut\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Certificat de revocare creat.\n"
+"\n"
+"V� rug�m muta�i-l pe un medium pe care �l pute�i ascunde; dac� cineva pune\n"
+"m�na pe acest certificat l-ar putea folosi s� v� fac� cheia inutilizabil�.\n"
+"Este indicat s� tip�ri�i acest certificat �i s�-l p�stra�i undeva sigur, �n\n"
+"caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
+"ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Renun��"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Motiv pentru revocare: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Nici o descriere dat�)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Este aceasta OK? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# List� cu valori de �ncredere atribuite, creat� %s\n"
+"# (Folosi�i \"gpg --import-ownertrust\" pentru a le reface)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "nu pot deschide fi�ierul: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "linie prea lung�\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "eroare: `:' lips�\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "eroare: amprent� invalid�\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "eroare: nici o valoare �ncredere pentru proprietar\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "eroare g�sire �nregistrare �ncredere: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "eroare citire: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "AVERTISMENT: rezumatul `%s' nu este parte din OpenPGP.  Folosi�i-l pe "
+#~ "riscul dvs.!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[fi�iere]|cifreaz� fi�iere"
+
+#~ msgid "store only"
+#~ msgstr "doar p�streaz�"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[fi�iere]|decripteaz� fi�iere"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "semneaz� o cheie irevocabil"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "semneaz� o cheie local �i irevocabil"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "enumer� numai secven�a de pachete"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "export� valorile �ncrederii �n proprietari"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "import� valorile �ncrederii �n proprietari"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "actualizare f�r� supraveghere a bazei de date de �ncredere"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "repar� o baz� de date de �ncredere corupt�"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Elimin� armura unui fi�ier sau intr�rii standard (stdin)"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Pune armura unui fi�ier sau intr�rii standard (stdin)"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NUME|folose�te NUME ca destinatar implicit"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "folose�te cheia implicit� ca destinatar implicit"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "nu folosi deloc terminalul"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "for�eaz� semn�turi v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "nu for�a semn�turi v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "for�eaz� semn�turi de chei v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "nu for�a semn�turi de chei v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "nu folosi niciodat� un MDC pentru cifrare"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "folose�te gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "modul batch: nu �ntreba niciodat�"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "presupune da la cele mai multe �ntreb�ri"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "presupune nu la cele mai multe �ntreb�ri"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "adaug� acest inel de chei la lista inelelor de chei"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "adaug� acest inel de chei secret la list�"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
+
+#~ msgid "read options from file"
+#~ msgstr "cite�te op�iuni din fi�ier"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[fi�ier]|scrie informa�ii de stare �n fi�ier"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|IDCHEIE|ai �ncredere deplin� �n aceast� cheie"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emuleaz� modul descris �n RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "seteaz� toate op�iunile pentru pachete, cifru �i rezumat ca pentru "
+#~ "comportamentul OpenPGP"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "seteaz� toate op�iunile pentru pachete, cifru �i rezumat ca pentru "
+#~ "comportamentul PGP 2.x"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|folose�te modul fraz�-parol� N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NUME|folose�te algoritm rezumat mesaj NUME pentru fraza-parol�"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NUME|folose�te algoritm cifrare NUME"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|folose�te algoritm compresie N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "ignor� c�mp keyid pentru pachete cifrate"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Arat� poze ID-uri"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Nu ar�ta poze ID-uri"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Seteaz� linia de comand� pentru a vedea poze ID-uri"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "algoritm compresie `%s' este numai-citire �n acest� edi�ie\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "algoritm compresie trebuie s� fie �n intervalul %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Nu este sigur dac� aceast� cheie apar�ine �ntr-adev�r\n"
+#~ "proprietarului, dar este oricum acceptat�\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "preferin�a %c%lu nu este valid�\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "cheia %08lX: nu e o cheie rfc2440 - s�rit�\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "NOT�: cheie primar� Elgamal detectat� - poate lua ceva timp pentru a "
+#~ "importa\n"
+
+#~ msgid " (default)"
+#~ msgstr "(implicit)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  creat�: %s expir�: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Nota�ie:"
+
+#~ msgid "Policy: "
+#~ msgstr "Politica: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "cer cheia %08lX de la %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "nu pot ob�ine cheia de la serverul de chei: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "eroare trimitere la `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "succes trimitere la `%s' (stare=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "a e�uat trimiterea la `%s': stare=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "acest sercer de chei nu suport� --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "nu pot c�uta serverul de chei: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "cheie %08lX: aceasta este o cheie ElGamal generat� de PGP care NU este "
+#~ "sigur� pentru semn�turi!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "cheia %08lX a fost creat� %lu secund� �n viitor (warp �n timp sau "
+#~ "probleme cu ceasul)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "cheia %08lX a fost creat� %lu secunde �n viitor (warp �n timp sau "
+#~ "probleme cu ceasul)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "cheia %08lX marcat� ca av�nd �ncredere suprem�\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "semn�tur� de la cheia de semnare Elgamal %08lX la %08lX s�rit�\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "semn�tur� de la %08lX la cheia de semnare Elgamal %08lX s�rit�\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "verificare la nivel %d semnat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Selecta�i algoritmul de folosit.\n"
+#~ "\n"
+#~ "DSA (sau DSS) este algoritmul de semn�tur� digital� care poate fi "
+#~ "folosit\n"
+#~ "doar pentru semn�turi.  Acesta este algoritmul sugerat pentru c� "
+#~ "verificarea\n"
+#~ "semn�turilor DSA este mult mai rapid� dec�t a celor ElGamal.\n"
+#~ "\n"
+#~ "ElGamal este un algoritm ce poate fi folosit pentru semn�turi �i "
+#~ "cifrare.\n"
+#~ "OpenPGP face distinc�ie �ntre cele dou� variante ale acestui algoritm: "
+#~ "cel\n"
+#~ "numai pentru cifrare �i cel pentru semnare+cifrare; algoritmul este "
+#~ "acela�i\n"
+#~ "dar c��iva parametrii trebuie selecta�i �ntr-un mod special pentru a "
+#~ "crea\n"
+#~ "o cheie sigur� pentru semn�turi: acest program face acest lucru, dar "
+#~ "alte\n"
+#~ "implement�ri OpenPGP ar putea s� nu �n�eleag� varianta de semnare"
+#~ "+cifrare.\n"
+#~ "\n"
+#~ "Prima cheie (primar�) trebuie s� fie �ntotdeauna capabil� de semnare;\n"
+#~ "acesta este motivul pentru care cheia ElGamal nu este disponibil� �n\n"
+#~ "acest meniu."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "De�� aceste chei sunt definite �n RFC2440 ele nu sunt sugerate pentru\n"
+#~ "c� nu sunt suportate de toate programele �i semn�turile create cu ele\n"
+#~ "sunt destul de lungi �i verificarea lor este foarte lent�."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu chei p�n� acum verificate (%lu semn�turi)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "cheie incomplet�\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "cheie %08lX incomplet�\n"
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 000000000..ffec3d8eb
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,5629 @@
+# GnuPG Russian Translation
+# Copyright (C)2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the GnuPG package.
+# Maxim Britov <[email protected]>, 2003.
+# Thanks a lot to Pawel I. Shajdo <[email protected]>.
+msgid ""
+msgstr ""
+"Project-Id-Version: GnuPG 1.2.4\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-12-23 19:24+0100\n"
+"Last-Translator: Maxim Britov <[email protected]>\n"
+"Language-Team: Russian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: util/secmem.c:90
+msgid "WARNING: using insecure memory!\n"
+msgstr "ВНИМАНИЕ: используется незащищённая память!\n"
+
+#: util/secmem.c:91
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
+
+#: util/secmem.c:340
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "операция невозможна без инициализации защищённой памяти\n"
+
+#: util/secmem.c:341
+msgid "(you may have used the wrong program for this task)\n"
+msgstr ""
+"(возможно, Вы используете неподходящее программное обеспечение\n"
+"для данной задачи)\n"
+
+#: util/miscutil.c:307 util/miscutil.c:344
+msgid "yes"
+msgstr "да"
+
+#: util/miscutil.c:308 util/miscutil.c:349
+msgid "yY"
+msgstr "yY"
+
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "нет"
+
+#: util/miscutil.c:311 util/miscutil.c:350
+msgid "nN"
+msgstr "nN"
+
+#: util/miscutil.c:348 g10/keyedit.c:1138
+msgid "quit"
+msgstr "Выход"
+
+#: util/miscutil.c:351
+msgid "qQ"
+msgstr "qQ"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "общая ошибка"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "неизвестный тип пакета"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "неизвестная версия"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "неизвестный алгоритм с открытым ключом"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "неизвестная хэш-функция"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "неправильный открытый ключ"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "неправильный секретный ключ"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "подпись неверна"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "несоответствие контрольной сумме"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "неправильный пароль"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "открытый ключ не найден"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "неизвестный алгоритм шифрования"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "не могу открыть таблицу ключей"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "неправильный пакет"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "неправильная ASCII кодировка"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "нет такого User ID"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "секретный ключ не найден"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "использован неправильный секретный ключ"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "не поддерживается"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "неправильный ключ"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "ошибка чтения файла"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "ошибка записи файла"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "неизвестный алгоритм сжатия"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "ошибка открытия файла"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "ошибка создания файла"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "неправильный пароль"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "нереализованный алгоритм с открытым ключом"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "нереализованный алгоритм шифрования"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "неизвестный класс подписи"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "ошибка в таблице доверий"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "неверный MPI"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "нехватка ресурсов"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "неправильная таблица ключей"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "неправильный сертификат"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "деформированный User ID"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "ошибка закрытия файла"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "ошибка переименования файла"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "ошибка удаления файла"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "неожидавшиеся данные"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "конфликт с отметкой времени"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "непригодный алгоритм с открытым ключом"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "файл существует"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "слабый ключ"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "недопустимый аргумент"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "плохой URI"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "неподдерживаемый URI"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "ошибка сети"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "не зашифровано"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "не выполнено"
+
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "неприменимый открытый ключ"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "неприменимый закрытый ключ"
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr "ошибка сервера ключей"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr " ... это ошибка (%s:%d:%s)\n"
+
+#: util/logger.c:285
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "Вы нашли ошибку ... (%s:%d)\n"
+
+#: cipher/random.c:163
+msgid "no entropy gathering module detected\n"
+msgstr "не найден модуль накопления энтропии\n"
+
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "не могу открыть `%s': %s\n"
+
+#: cipher/random.c:391
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "не могу выполнить stat `%s': %s\n"
+
+#: cipher/random.c:396
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "`%s' не регулярный файл - проигнорирован\n"
+
+#: cipher/random.c:401
+msgid "note: random_seed file is empty\n"
+msgstr "замечание: файл random_seed пуст\n"
+
+#: cipher/random.c:407
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "ВНИМАНИЕ: недопустимый размер файла random_seed - не использую\n"
+
+#: cipher/random.c:415
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "не могу прочитать `%s': %s\n"
+
+#: cipher/random.c:453
+msgid "note: random_seed file not updated\n"
+msgstr "замечание: файл random_seed не обновлен\n"
+
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "не могу создать `%s': %s\n"
+
+#: cipher/random.c:480
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "не могу записать `%s': %s\n"
+
+#: cipher/random.c:483
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "не могу закрыть `%s': %s\n"
+
+#: cipher/random.c:728
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "ВНИМАНИЕ: используется небезопасный генератор случайных чисел!!\n"
+
+#: cipher/random.c:729
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"Генератор случайных чисел только заглушка для того,\n"
+"чтобы программа могла работать - он НЕ МОЖЕТ использоваться\n"
+"для генерации надёжных случайных чисел!\n"
+"\n"
+"НЕ ПОЛЬЗУЙТЕСЬ ДАННЫМИ СОЗДАННЫМИ ЭТОЙ ВЕРСИЕЙ ПРОГРАММЫ!!\n"
+"\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Недостаточно случайных чисел.  Выполняйте какие-либо действия для того,\n"
+"чтобы ОС могла получить большую энтропию! (Необходимо еще %d байт)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "хэш-функция `%s' в данной версии только для чтения\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Подождите пожалуйста, собираются случайные данные. Выполняйте какую-нибудь\n"
+"работу, это спасет от скуки и увеличит качество и скорость сбора\n"
+"случайных данных.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "не могу создать главное число меньшее %d бит\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "не могу создать главное число меньшее %d бит\n"
+
+#: g10/g10.c:354
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Команды:\n"
+" "
+
+#: g10/g10.c:356
+msgid "|[file]|make a signature"
+msgstr "|[file]|создать подпись к файлу"
+
+#: g10/g10.c:357
+msgid "|[file]|make a clear text signature"
+msgstr "|[file]|создать прозрачную подпись к файлу"
+
+#: g10/g10.c:358
+msgid "make a detached signature"
+msgstr "создать отделенную (detached) подпись"
+
+#: g10/g10.c:359
+msgid "encrypt data"
+msgstr "зашифровать данные"
+
+#: g10/g10.c:361
+msgid "encryption only with symmetric cipher"
+msgstr "зашифровать только симметричным шифром"
+
+#: g10/g10.c:363
+msgid "decrypt data (default)"
+msgstr "расшифровать данные (по умолчанию)"
+
+#: g10/g10.c:365
+msgid "verify a signature"
+msgstr "проверить подпись"
+
+#: g10/g10.c:367
+msgid "list keys"
+msgstr "вывести список ключей"
+
+#: g10/g10.c:369
+msgid "list keys and signatures"
+msgstr "вывести список ключей и подписей"
+
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "проверка подписей на ключе"
+
+#: g10/g10.c:371
+msgid "list keys and fingerprints"
+msgstr "вывести список ключей и их отпечатков"
+
+#: g10/g10.c:372
+msgid "list secret keys"
+msgstr "вывести список секретных ключей"
+
+#: g10/g10.c:373
+msgid "generate a new key pair"
+msgstr "создать новую пару ключей"
+
+#: g10/g10.c:374
+msgid "remove keys from the public keyring"
+msgstr "удалить ключи из таблицы открытых ключей"
+
+#: g10/g10.c:376
+msgid "remove keys from the secret keyring"
+msgstr "удалить ключи из таблицы закрытых ключей"
+
+#: g10/g10.c:377
+msgid "sign a key"
+msgstr "подписать ключ"
+
+#: g10/g10.c:378
+msgid "sign a key locally"
+msgstr "подписать ключ локально"
+
+#: g10/g10.c:381
+msgid "sign or edit a key"
+msgstr "подписать или редактировать ключ"
+
+#: g10/g10.c:382
+msgid "generate a revocation certificate"
+msgstr "создать сертификат отзыва"
+
+#: g10/g10.c:384
+msgid "export keys"
+msgstr "экспортировать ключи"
+
+#: g10/g10.c:385
+msgid "export keys to a key server"
+msgstr "экспортировать ключи на сервер ключей"
+
+#: g10/g10.c:386
+msgid "import keys from a key server"
+msgstr "импортировать ключи с сервера ключей"
+
+#: g10/g10.c:388
+msgid "search for keys on a key server"
+msgstr "искать ключи на сервере ключей"
+
+#: g10/g10.c:390
+msgid "update all keys from a keyserver"
+msgstr "обновить все ключи с сервера ключей"
+
+#: g10/g10.c:393
+msgid "import/merge keys"
+msgstr "импортировать/объединить ключи"
+
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
+
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
+
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
+
+#: g10/g10.c:406
+msgid "update the trust database"
+msgstr "обновить таблицу доверий"
+
+#: g10/g10.c:413
+msgid "|algo [files]|print message digests"
+msgstr "|algo [files]|вывести хэши файлов"
+
+#: g10/g10.c:417 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Параметры:\n"
+" "
+
+#: g10/g10.c:419
+msgid "create ascii armored output"
+msgstr "вывод в ASCII формате"
+
+#: g10/g10.c:421
+msgid "|NAME|encrypt for NAME"
+msgstr "|NAME|зашифровать для получателя NAME"
+
+#: g10/g10.c:432
+msgid "use this user-id to sign or decrypt"
+msgstr "использовать данный User ID для подписывания и расшифрования"
+
+#: g10/g10.c:433
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
+
+#: g10/g10.c:438
+msgid "use canonical text mode"
+msgstr "использовать канонический текстовый режим"
+
+#: g10/g10.c:448
+msgid "use as output file"
+msgstr "вывод в указанный файл"
+
+#: g10/g10.c:450 g10/gpgv.c:66
+msgid "verbose"
+msgstr "подробно"
+
+#: g10/g10.c:461
+msgid "do not make any changes"
+msgstr "не делать никаких изменений"
+
+#: g10/g10.c:462
+msgid "prompt before overwriting"
+msgstr "спросить перед перезаписью"
+
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
+
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:535
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(См. документацию для более полного ознакомления с командами и параметрами)\n"
+
+#: g10/g10.c:538
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"Примеры:\n"
+"\n"
+" -se -r Bob [файл]          подписать и зашифровать для получателя Bob\n"
+" --clearsign [файл]         создать прозрачную подпись\n"
+" --detach-sign [файл]       создать отделенную подпись\n"
+" --list-keys [имена]        показать ключи\n"
+" --fingerprint [имена]      показать отпечатки (fingerprints)\n"
+
+#: g10/g10.c:713 g10/gpgv.c:91
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr ""
+"О найденных ошибка сообщайте <[email protected]>.\n"
+"Подпишитесь на русскоязычную группу рассылки GnuPG-ru отправив письмо по "
+"адресу [email protected] с темой subscribe.\n"
+
+#: g10/g10.c:730
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
+
+#: g10/g10.c:733
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Синтаксис: gpg [параметры] [файлы]\n"
+"подписать и проверить, зашифровать или расшифровать\n"
+"операция по умолчанию зависит от входных данных\n"
+
+#: g10/g10.c:744
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Поддерживаются следующие алгоритмы:\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "С открытым ключом: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Симметричные шифры: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Хэш-функции: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Алгоритмы сжатия: "
+
+#: g10/g10.c:848
+msgid "usage: gpg [options] "
+msgstr "использование: gpg [опции] "
+
+#: g10/g10.c:951
+msgid "conflicting commands\n"
+msgstr "несовместимые команды\n"
+
+#: g10/g10.c:969
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr "no = sign found in group definition \"%s\"\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "файл конфигурации содержит неизвестный параметр \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "ЗАМЕЧАНИЕ: файл настроек старого формата `%s' проигнорирован\n"
+
+#: g10/g10.c:1637
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "ЗАМЕЧАНИЕ: файл настроек `%s' не обнаружен\n"
+
+#: g10/g10.c:1641
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "файл настроек `%s': %s\n"
+
+#: g10/g10.c:1648
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "настройки взяты из файла `%s'\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного использования!\n"
+
+#: g10/g10.c:1887
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr ""
+"расширение шифра \"%s\" не загружено вследствие небезопасных прав доступа\n"
+
+#: g10/g10.c:2099
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s недопустимая таблица символов\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "не могу проанализировать URI сервера ключей\n"
+
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: недопустимые параметры экспорта\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "недопустимые параметры экспорта\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: недопустимые параметры импорта\n"
+
+#: g10/g10.c:2137
+msgid "invalid import options\n"
+msgstr "недопустимые параметры импорта\n"
+
+#: g10/g10.c:2144
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: недопустимые параметры экспорта\n"
+
+#: g10/g10.c:2147
+msgid "invalid export options\n"
+msgstr "недопустимые параметры экспорта\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: недопустимые параметры импорта\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "недопустимые параметры импорта\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: недопустимые параметры экспорта\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "недопустимые параметры экспорта\n"
+
+#: g10/g10.c:2208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "не могу определить путь запуска для %s\n"
+
+#: g10/g10.c:2398
+msgid "WARNING: program may create a core file!\n"
+msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
+
+#: g10/g10.c:2402
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "ВНИМАНИЕ: %s заменит %s\n"
+
+#: g10/g10.c:2411
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s недопустимо использовать с %s!\n"
+
+#: g10/g10.c:2414
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s не имеет смысла совместно с %s!\n"
+
+#: g10/g10.c:2435
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr ""
+"Можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
+
+#: g10/g10.c:2441
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
+
+#: g10/g10.c:2447
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
+
+#: g10/g10.c:2460
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "для зашифровки сообщения в режиме --pgp2 требуется шифр IDEA\n"
+
+#: g10/g10.c:2528 g10/g10.c:2552
+msgid "selected cipher algorithm is invalid\n"
+msgstr "выбран неверный алгоритм шифрования\n"
+
+#: g10/g10.c:2534 g10/g10.c:2558
+msgid "selected digest algorithm is invalid\n"
+msgstr "выбрана неверная хэш-функция\n"
+
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "выбран неверный алгоритм шифрования\n"
+
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "выбрана неверная хэш-функция для сертификации\n"
+
+#: g10/g10.c:2561
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed должен быть больше 0\n"
+
+#: g10/g10.c:2563
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed должен быть больше 1\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
+
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "недопустимый min-cert-level; должен быть 1, 2 или 3\n"
+
+#: g10/g10.c:2572
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "ЗАМЕЧАНИЕ: простой (0) режим S2K строго не рекомендуется\n"
+
+#: g10/g10.c:2576
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
+
+#: g10/g10.c:2583
+msgid "invalid default preferences\n"
+msgstr "недопустимые предпочтения по умолчанию\n"
+
+#: g10/g10.c:2592
+msgid "invalid personal cipher preferences\n"
+msgstr "недопустимые персональные предпочтения шифра\n"
+
+#: g10/g10.c:2596
+msgid "invalid personal digest preferences\n"
+msgstr "недопустимые персональные предпочтения хэш-функции\n"
+
+#: g10/g10.c:2600
+msgid "invalid personal compress preferences\n"
+msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s не работает пока с %s\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "Вы не можете использовать шифрование \"%s\" в режиме %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "Вы не можете использовать хэш-функцию \"%s\" в режиме %s\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "Вы не можете использовать сжатие \"%s\" в режиме %s\n"
+
+#: g10/g10.c:2778
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "сбой инициализации таблицы доверий: %s\n"
+
+#: g10/g10.c:2789
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
+"ключом\n"
+
+#: g10/g10.c:2800
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
+#: g10/g10.c:2807
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
+#: g10/g10.c:2819
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "Вы не можете использовать %s в режиме %s\n"
+
+#: g10/g10.c:2855
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
+#: g10/g10.c:2868
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "Вы не можете использовать %s в режиме %s\n"
+
+#: g10/g10.c:2908
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
+#: g10/g10.c:2917
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
+#: g10/g10.c:2942
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
+#: g10/g10.c:2950
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
+#: g10/g10.c:2954
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
+#: g10/g10.c:2958
+msgid "--nrsign-key user-id"
+msgstr "--nrsign-key user-id"
+
+#: g10/g10.c:2962
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key user-id"
+
+#: g10/g10.c:2986
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "не могу открыть %s: %s\n"
+
+#: g10/g10.c:3057
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [user-id] [keyring]"
+
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "неудача при отправке на сервер ключей: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "неудача при получении с сервера ключей: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "не удалось экспортировать ключ: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "неудача при поиске на сервере ключей: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "неудача при обновлении на сервере ключей: %s\n"
+
+#: g10/g10.c:3160
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "ошибка преобразования из ASCII формата: %s\n"
+
+#: g10/g10.c:3168
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "ошибка преобразования в ASCII формат: %s\n"
+
+#: g10/g10.c:3255
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "недопустимая хэш-функция `%s'\n"
+
+#: g10/g10.c:3378
+msgid "[filename]"
+msgstr "[filename]"
+
+#: g10/g10.c:3382
+msgid "Go ahead and type your message ...\n"
+msgstr "Набирайте Ваше сообщение ...\n"
+
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "не могу открыть `%s'\n"
+
+#: g10/g10.c:3659
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"имя примечания должно содержать только печатные символы или пробелы,и "
+"заканчиваться знаком '='\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "имя примечания должно содержать '@' символ\n"
+
+#: g10/g10.c:3678
+msgid "a notation value must not use any control characters\n"
+msgstr "значение примечания не должно содержать управляющие символы\n"
+
+#: g10/g10.c:3712
+msgid "the given certification policy URL is invalid\n"
+msgstr "заданный URL правил сертификации неверен\n"
+
+#: g10/g10.c:3714
+msgid "the given signature policy URL is invalid\n"
+msgstr "заданный URL правил подписи неверен\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "заданный URL правил подписи неверен\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "уменьшить количество выводимой информации"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "используются ключи из данной таблицы ключей"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr ""
+"при несоответствии отметки времени ограничиваться только предупреждением"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Использовать: gpgv [параметры] [файлы] (-h для подсказки)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Синтаксис: gpg [параметры] [файлы]\n"
+"Проверка подписей сделанных доверяемыми ключами\n"
+
+#: g10/armor.c:317
+#, c-format
+msgid "armor: %s\n"
+msgstr "Формат ASCII: %s\n"
+
+#: g10/armor.c:346
+msgid "invalid armor header: "
+msgstr "неправильный заголовок ASCII: "
+
+#: g10/armor.c:353
+msgid "armor header: "
+msgstr "Заголовок ASCII: "
+
+#: g10/armor.c:364
+msgid "invalid clearsig header\n"
+msgstr "неправильный заголовок прозрачной подписи\n"
+
+#: g10/armor.c:416
+msgid "nested clear text signatures\n"
+msgstr "вложенные прозрачные подписи\n"
+
+#: g10/armor.c:553
+msgid "invalid dash escaped line: "
+msgstr "неправильный отступ из минусов: "
+
+#: g10/armor.c:565
+msgid "unexpected armor:"
+msgstr "неожиданный формат ASCII:"
+
+#: g10/armor.c:695 g10/armor.c:1276
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "недопустимый символ radix64 %02x пропущен\n"
+
+#: g10/armor.c:738
+msgid "premature eof (no CRC)\n"
+msgstr "преждевременный конец файла (eof) (нет CRC)\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in CRC)\n"
+msgstr "преждевременный конец файла (eof) (в CRC)\n"
+
+#: g10/armor.c:776
+msgid "malformed CRC\n"
+msgstr "плохо сформированный CRC\n"
+
+#: g10/armor.c:780 g10/armor.c:1313
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "ошибка контрольной суммы CRC; %06lx - %06lx\n"
+
+#: g10/armor.c:800
+msgid "premature eof (in Trailer)\n"
+msgstr "преждевременный конец файла (eof) (в дополнении)\n"
+
+#: g10/armor.c:804
+msgid "error in trailer line\n"
+msgstr "ошибка в строке дополнения\n"
+
+#: g10/armor.c:1091
+msgid "no valid OpenPGP data found.\n"
+msgstr "не найдено данных формата OpenPGP.\n"
+
+#: g10/armor.c:1096
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
+
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"quoted printable символы в ASCII кодировке - вероятно использовался плохой "
+"MTA\n"
+
+#: g10/pkclist.c:61 g10/revoke.c:576
+msgid "No reason specified"
+msgstr "Без указания причины"
+
+#: g10/pkclist.c:63 g10/revoke.c:578
+msgid "Key is superseded"
+msgstr "Ключ заменён другим"
+
+#: g10/pkclist.c:65 g10/revoke.c:577
+msgid "Key has been compromised"
+msgstr "Ключ был скомпрометирован"
+
+#: g10/pkclist.c:67 g10/revoke.c:579
+msgid "Key is no longer used"
+msgstr "Ключ больше не используется"
+
+#: g10/pkclist.c:69 g10/revoke.c:580
+msgid "User ID is no longer valid"
+msgstr "User ID больше не действителен"
+
+#: g10/pkclist.c:73
+msgid "reason for revocation: "
+msgstr "причина отзыва: "
+
+#: g10/pkclist.c:90
+msgid "revocation comment: "
+msgstr "прокомментируйте отзыв: "
+
+#: g10/pkclist.c:195
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
+msgstr ""
+"Не задано значение доверия для:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                aka \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                aka \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+"Укажите насколько Вы доверяете данному пользователю в\n"
+"вопросах проверки достоверности ключей других пользователей.\n"
+"Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
+"\n"
+
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = Не знаю\n"
+
+#: g10/pkclist.c:252
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = Не доверяю\n"
+
+#: g10/pkclist.c:254
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = Доверяю ограниченно\n"
+
+#: g10/pkclist.c:256
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = Полностью доверяю\n"
+
+#: g10/pkclist.c:258
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = Абсолютно доверяю\n"
+
+#: g10/pkclist.c:261
+msgid " i = please show me more information\n"
+msgstr " i = покажите мне больше информации\n"
+
+#: g10/pkclist.c:264
+msgid " m = back to the main menu\n"
+msgstr " m = вернуться в главное меню\n"
+
+#: g10/pkclist.c:267
+msgid " s = skip this key\n"
+msgstr " s = пропустить этот ключ\n"
+
+#: g10/pkclist.c:268
+msgid " q = quit\n"
+msgstr " q = выход\n"
+
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
+msgid "Your decision? "
+msgstr "Ваше решение (?-подробнее)? "
+
+#: g10/pkclist.c:299
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "Вы действительно АБСОЛЮТНО доверяете владельцу этого ключа? "
+
+#: g10/pkclist.c:313
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Сертификаты, приводящие к абсолютно доверяемому ключу:\n"
+
+#: g10/pkclist.c:387
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "ключ %08lX: был отозван!\n"
+
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
+msgid "Use this key anyway? "
+msgstr "Все равно использовать данный ключ? "
+
+#: g10/pkclist.c:399
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "ключ %08lX: подключ был отозван!\n"
+
+#: g10/pkclist.c:420
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: ключ просрочен\n"
+
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr "%08lX: Нет свидетельств того, что данный ключ принадлежит владельцу\n"
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: НЕТ ДОВЕРИЯ владельцу данного ключа\n"
+
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "%08lX: Нет свидетельств того, что данный ключ принадлежит владельцу\n"
+
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "Этот ключ вероятно принадлежит его владельцу\n"
+
+#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "Данный ключ принадлежит нам\n"
+
+#: g10/pkclist.c:500
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+"Нет уверенности в том, что ключ принадлежит человеку указанному\n"
+"в User ID.  Если Вы ТОЧНО знаете, что Вы делаете,\n"
+"ответьте утвердительно на следующий вопрос\n"
+"\n"
+
+#: g10/pkclist.c:514 g10/pkclist.c:544
+msgid "WARNING: Using untrusted key!\n"
+msgstr "ВНИМАНИЕ: Использование недоверяемого ключа!\n"
+
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "ВНИМАНИЕ: возможно ключ отозван: ключ отзыва отсутствует.\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "ВНИМАНИЕ: Данный ключ отозван отзывающим ключом!\n"
+
+#: g10/pkclist.c:563
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "ВНИМАНИЕ: Данный ключ отозван его владельцем!\n"
+
+#: g10/pkclist.c:564
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         Это может означать, что подпись поддельная.\n"
+
+#: g10/pkclist.c:570
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "ВНИМАНИЕ: Данный подключ был отозван его владельцем!\n"
+
+#: g10/pkclist.c:575
+msgid "Note: This key has been disabled.\n"
+msgstr "ПРЕДУПРЕЖДАЮ: Данный ключ отключен.\n"
+
+#: g10/pkclist.c:580
+msgid "Note: This key has expired!\n"
+msgstr "ПРЕДУПРЕЖДАЮ: Данный ключ просрочен!\n"
+
+#: g10/pkclist.c:591
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "ВНИМАНИЕ: Данный ключ не заверен доверенной подписью!\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr "         Нет уверенности, что подпись принадлежит владельцу.\n"
+
+#: g10/pkclist.c:601
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "ВНИМАНИЕ: НЕТ ДОВЕРИЯ данному ключу!\n"
+
+#: g10/pkclist.c:602
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         Возможно, что подпись ПОДДЕЛАНА.\n"
+
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"ВНИМАНИЕ: Этот ключ не заверен достаточным количеством доверяемых подписей!\n"
+
+#: g10/pkclist.c:612
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         Нет основания полагать, что подпись принадлежит владельцу.\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "Вы не можете использовать %s в режиме %s\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: пропущено: %s\n"
+
+#: g10/pkclist.c:787 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: пропущено: открытый ключ уже существует\n"
+
+#: g10/pkclist.c:829
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr "Не задан User ID. (можете использовать \"-r\")\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+"\n"
+"Введите User ID.  Пустая строка для завершения: "
+
+#: g10/pkclist.c:887
+msgid "No such user ID.\n"
+msgstr "Нет такого User ID.\n"
+
+#: g10/pkclist.c:892 g10/pkclist.c:954
+msgid "skipped: public key already set as default recipient\n"
+msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
+
+#: g10/pkclist.c:910
+msgid "Public key is disabled.\n"
+msgstr "Открытый ключ отключен.\n"
+
+#: g10/pkclist.c:917
+msgid "skipped: public key already set\n"
+msgstr "пропущено: открытый ключ уже установлен\n"
+
+#: g10/pkclist.c:946
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "неизвестный получатель по умолчанию `%s'\n"
+
+#: g10/pkclist.c:991
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: пропущено: открытый ключ отключен\n"
+
+#: g10/pkclist.c:1046
+msgid "no valid addressees\n"
+msgstr "нет действительных адресов\n"
+
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "предпочтения %c%lu дублируются\n"
+
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "слишком много `%c' предпочтений\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "слишком много `%c' предпочтений\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "слишком много `%c' предпочтений\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "недопустимый символ в строке предпочтений\n"
+
+#: g10/keygen.c:738
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:777
+msgid "writing self signature\n"
+msgstr "сохраняем самоподпись\n"
+
+#: g10/keygen.c:823
+msgid "writing key binding signature\n"
+msgstr "сохраняем объединяющую подпись\n"
+
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "неверный размер ключа; используется %u бит\n"
+
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "размер ключа приведен к %u битам\n"
+
+#: g10/keygen.c:1165
+msgid "Please select what kind of key you want:\n"
+msgstr "Выберите тип ключа:\n"
+
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
+
+#: g10/keygen.c:1168
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (только для подписи)\n"
+
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (только для шифрования)\n"
+
+#: g10/keygen.c:1171
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (только для подписи)\n"
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (только для шифрования)\n"
+
+#: g10/keygen.c:1175
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (подпись и шифрование)\n"
+
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+msgid "Your selection? "
+msgstr "Ваш выбор (?-подробнее)? "
+
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+msgid "Invalid selection.\n"
+msgstr "Неправильный выбор.\n"
+
+#: g10/keygen.c:1225
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Создаем новую пару %s ключей.\n"
+"              минимальный размер ключа   768 бит\n"
+"              размер ключа по умолчанию 1024 бит\n"
+"      максимально рекомендуемый размер  2048 бит\n"
+
+#: g10/keygen.c:1234
+msgid "What keysize do you want? (1024) "
+msgstr "Какой размер ключа Вы выбрали? (1024) "
+
+#: g10/keygen.c:1239
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA поддерживает размер ключа от 512 до 1024\n"
+
+#: g10/keygen.c:1241
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "слишком малый размер ключа; 1024 - минимальный размер ключа RSA.\n"
+
+#: g10/keygen.c:1244
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "слишком малый размер ключа; 768 - минимально допустимый размер.\n"
+
+#: g10/keygen.c:1255
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "слишком большой размер ключа; %d - максимально допустимый размер.\n"
+
+#: g10/keygen.c:1260
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"Размер ключа больше 2048 не рекомендуется, т.к.\n"
+"вычисления с ним займут МНОГО времени!\n"
+
+#: g10/keygen.c:1263
+msgid "Are you sure that you want this keysize? "
+msgstr "Вы действительно хотите иметь ключ такого размера? "
+
+#: g10/keygen.c:1264
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Отлично, только помните, что излучение монитора и клавиатуры\n"
+"также могут быть перехвачены!\n"
+
+#: g10/keygen.c:1273
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Запрашиваемый размер ключа %u бит\n"
+
+#: g10/keygen.c:1276 g10/keygen.c:1280
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "приведен к размеру %u бит\n"
+
+#: g10/keygen.c:1331
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+"Выберите срок действия ключа.\n"
+"         0 = без ограничения срока действия\n"
+"      <n>  = срок действия n дней\n"
+"      <n>w = срок действия n недель\n"
+"      <n>m = срок действия n месяцев\n"
+"      <n>y = срок действия n лет\n"
+
+#: g10/keygen.c:1340
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"Выберите срок действия подписи.\n"
+"         0 = подпись без ограничения срока действия\n"
+"      <n>  = срок действия подписи n дней\n"
+"      <n>w = срок действия подписи n недель\n"
+"      <n>m = срок действия подписи n месяцев\n"
+"      <n>y = срок действия подписи n лет\n"
+
+#: g10/keygen.c:1362
+msgid "Key is valid for? (0) "
+msgstr "Ключ действителен до? (0) "
+
+#: g10/keygen.c:1364
+msgid "Signature is valid for? (0) "
+msgstr "Подпись действительна до? (0) "
+
+#: g10/keygen.c:1369
+msgid "invalid value\n"
+msgstr "неправильное значение\n"
+
+#: g10/keygen.c:1374
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr "%s не имеет ограничения срока действия\n"
+
+#: g10/keygen.c:1381
+#, c-format
+msgid "%s expires at %s\n"
+msgstr "%s действителен до: %s\n"
+
+#: g10/keygen.c:1387
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Ваша система не может корректно отображать даты после 2038.\n"
+"Однако, корректно обрабатываются даты до 2106.\n"
+
+#: g10/keygen.c:1392
+msgid "Is this correct (y/n)? "
+msgstr "Все верно? (y/n) "
+
+#: g10/keygen.c:1435
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"Для идентификации Вашего ключа необходим User ID\n"
+"Программа создаст его из Вашего имени, комментария и адреса e-mail в виде:\n"
+"    \"Baba Yaga (pensioner) <[email protected]>\"\n"
+"\n"
+
+#: g10/keygen.c:1447
+msgid "Real name: "
+msgstr "Ваше настоящее имя: "
+
+#: g10/keygen.c:1455
+msgid "Invalid character in name\n"
+msgstr "Недопустимый символ в Имени\n"
+
+#: g10/keygen.c:1457
+msgid "Name may not start with a digit\n"
+msgstr "Имя не должно начинаться с цифры\n"
+
+#: g10/keygen.c:1459
+msgid "Name must be at least 5 characters long\n"
+msgstr "Имя не должно быть короче 5 символов\n"
+
+#: g10/keygen.c:1467
+msgid "Email address: "
+msgstr "Email-адрес: "
+
+#: g10/keygen.c:1478
+msgid "Not a valid email address\n"
+msgstr "Неправильный e-mail адрес\n"
+
+#: g10/keygen.c:1486
+msgid "Comment: "
+msgstr "Комментарий: "
+
+#: g10/keygen.c:1492
+msgid "Invalid character in comment\n"
+msgstr "Недопустимый символ в комментарии\n"
+
+#: g10/keygen.c:1515
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "Используется таблица символов: `%s'.\n"
+
+#: g10/keygen.c:1521
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"Вы выбрали следующий User ID:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:1526
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "Не вставляйте email-адрес в имя пользователя и комментарий\n"
+
+#: g10/keygen.c:1531
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:1541
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
+
+#: g10/keygen.c:1542
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr ""
+"Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
+
+#: g10/keygen.c:1561
+msgid "Please correct the error first\n"
+msgstr "Сначала исправьте ошибку\n"
+
+#: g10/keygen.c:1600
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Для защиты секретного ключа необходим пароль.\n"
+"\n"
+
+#: g10/keygen.c:1609 g10/keyedit.c:1021
+msgid "passphrase not correctly repeated; try again"
+msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
+
+#: g10/keygen.c:1610
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:1616
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway.  You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"Вам не нужен пароль? Это ОЧЕНЬ ПЛОХАЯ идея!\n"
+"Работа будет продолжена. Вы сможете сменить пароль в любое время,\n"
+"запустив данную программу с ключом \"--edit-key\".\n"
+"\n"
+
+#: g10/keygen.c:1638
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Необходимо сгенерировать много случайных чисел. Желательно, что бы Вы\n"
+"выполняли некоторые другие действия (печать на клавиатуре, движения мыши,\n"
+"обращения к дискам) в процессе генерации; это даст генератору\n"
+"случайных чисел возможность получить лучшую энтропию.\n"
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "извините, но это невозможно выполнить в пакетном режиме\n"
+
+#: g10/keygen.c:2267
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "Пара ключей DSA будет иметь длину 1024 бита.\n"
+
+#: g10/keygen.c:2335
+msgid "Key generation canceled.\n"
+msgstr "Создание ключа прервано.\n"
+
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "сохранение открытого ключа в `%s'\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "сохранение секретного ключа в `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "сохранение секретного ключа в `%s'\n"
+
+#: g10/keygen.c:2565
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
+
+#: g10/keygen.c:2571
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
+
+#: g10/keygen.c:2589
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
+
+#: g10/keygen.c:2596
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
+
+#: g10/keygen.c:2619
+msgid "public and secret key created and signed.\n"
+msgstr "открытый и закрытый ключи созданы и подписаны.\n"
+
+#: g10/keygen.c:2630
+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 ""
+"Заметьте, что данный ключ не может использоваться для шифрования.  Вы "
+"можете\n"
+"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
+
+#: g10/keygen.c:2642 g10/keygen.c:2755
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Сбой при создании ключа: %s\n"
+
+#: g10/keygen.c:2691 g10/sign.c:290
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
+
+#: g10/keygen.c:2693 g10/sign.c:292
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
+
+#: g10/keygen.c:2702
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr ""
+"ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
+
+#: g10/keygen.c:2730
+msgid "Really create? "
+msgstr "Действительно создать? "
+
+#: g10/decrypt.c:98 g10/encode.c:845
+msgid "--output doesn't work for this command\n"
+msgstr "--output не работает для данной команды\n"
+
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: не могу открыть: %s\n"
+
+#: g10/encode.c:203 g10/sign.c:1144
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
+
+#: g10/encode.c:208
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "не могу использовать симметричные ESK пакеты в S2K режиме\n"
+
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "использую алгоритм шифрования %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "`%s' уже сжат\n"
+
+#: g10/encode.c:301 g10/encode.c:590
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: ВНИМАНИЕ: пустой файл\n"
+
+#: g10/encode.c:465
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr "в режиме --pgp2 ключ RSA для ширования должен быть не более 2048 бит\n"
+
+#: g10/encode.c:480
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "читаю из `%s'\n"
+
+#: g10/encode.c:516
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr "не могу использовать шифр IDEA для всех ключей.\n"
+
+#: g10/encode.c:526 g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "использование шифра %s (%d) нарушает предпочтения получателя\n"
+
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "сжатие алгоритмом %s (%d) нарушает предпочтения получателя\n"
+
+#: g10/encode.c:818
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s зашифровано для: \"%s\"\n"
+
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "ключ `%s' не найден: %s\n"
+
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "ошибка чтения блока ключей: %s\n"
+
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "ключ %08lX: не защищен - пропущен\n"
+
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "ключ %08lX: PGP 2.x стиля - пропущен\n"
+
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "ВНИМАНИЕ: секретный ключ %08lX не имеет SK контрольной суммы\n"
+
+#: g10/export.c:385
+msgid "WARNING: nothing exported\n"
+msgstr "ВНИМАНИЕ: нечего экспортировать\n"
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr "слишком много входов в pk кэше - отключено\n"
+
+#: g10/getkey.c:186 g10/getkey.c:2693
+msgid "[User id not found]"
+msgstr "[User ID Не найден]"
+
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+"Недействительный ключ %08lX разрешен параметром --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "нет секретного подключа для открытого подключа %08lX - игнорирую\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "используется вторичный ключ %08lX вместо главного %08lX\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "ключ %08lX: секретный ключ без открытого - пропущен\n"
+
+#: g10/import.c:241
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "пропущен блок типа %d\n"
+
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu ключей обработано\n"
+
+#: g10/import.c:255
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "ошибка чтения `%s': %s\n"
+
+#: g10/import.c:267
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Всего обработано: %lu\n"
+
+#: g10/import.c:269
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "        пропущено новых ключей: %lu\n"
+
+#: g10/import.c:272
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "                   без User ID: %lu\n"
+
+#: g10/import.c:274
+#, c-format
+msgid "              imported: %lu"
+msgstr "                 импортировано: %lu"
+
+#: g10/import.c:280
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "                  неизмененных: %lu\n"
+
+#: g10/import.c:282
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "                 новых User ID: %lu\n"
+
+#: g10/import.c:284
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "               новых подключей: %lu\n"
+
+#: g10/import.c:286
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "                новых подписей: %lu\n"
+
+#: g10/import.c:288
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "          новых отзывов ключей: %lu\n"
+
+#: g10/import.c:290
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "    прочитано секретных ключей: %lu\n"
+
+#: g10/import.c:292
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "импортировано секретных ключей: %lu\n"
+
+#: g10/import.c:294
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " неизменённых секретных ключей: %lu\n"
+
+#: g10/import.c:296
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr "              не импортировано: %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Вы подписали данные User ID:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s подпись, хэш-функция %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "ключ %08lX: не имеет User ID\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "ключ %08lX: HKP повреждение подключа исправлено\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "ключ %08lX: принят ключ без самоподписи '%s'\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "ключ %08lX: нет действительных User ID\n"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "причиной этого может быть отсутствие самоподписи\n"
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "ключ %08lX: не найден открытый ключ: %s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "ключ %08lX: новый ключ - пропущен\n"
+
+#: g10/import.c:755
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "нет доступной для записи таблицы ключей: %s\n"
+
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "сохраняю в `%s'\n"
+
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "ошибка записи таблицы ключей `%s': %s\n"
+
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "ключ %08lX: открытый ключ \"%s\" импортирован\n"
+
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "ключ %08lX: не совпадает с копией хранимой у нас\n"
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "ключ %08lX: не нахожу оригинальный блок ключей: %s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "ключ %08lX: не могу прочитать оригинальный блок ключей: %s\n"
+
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "ключ %08lX: \"%s\" 1 новый User ID\n"
+
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "ключ %08lX: \"%s\" %d новых User ID\n"
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "ключ %08lX: \"%s\" 1 новая подпись\n"
+
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "ключ %08lX: \"%s\" %d новых подписей\n"
+
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "ключ %08lX: \"%s\" 1 новый подключ\n"
+
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "ключ %08lX: \"%s\" %d новых подключей\n"
+
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "ключ %08lX: \"%s\" не изменен\n"
+
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "ключ %08lX: секретный ключ с недопустимым шифром %d - пропущен\n"
+
+#: g10/import.c:1064
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "нет основной таблицы секретных ключей: %s\n"
+
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "ключ %08lX: секретный ключ импортирован\n"
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "ключ %08lX: уже есть в таблице секретных ключей\n"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "ключ %08lX: не найден секретный ключ: %s\n"
+
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr ""
+"ключ %08lX: нет открытого ключа - не могу применить сертификат отзыва\n"
+
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "ключ %08lX: неправильный сертификат отзыва: %s - отвергнут\n"
+
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "ключ %08lX: \"%s\" сертификат отзыва импортирован\n"
+
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "ключ %08lX: нет User ID для подписи\n"
+
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "ключ %08lX: неподдерживаемый алгоритм с открытым ключом у \"%s\" \n"
+
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "ключ %08lX: неправильная самоподпись на \"%s\"\n"
+
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "ключ %08lX: нет подключа для связи ключей\n"
+
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "ключ %08lX: неподдерживаемый алгоритм с открытым ключом\n"
+
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "ключ %08lX: неправильная связь подключей\n"
+
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "ключ %08lX: удалено многократное связывание подключей\n"
+
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "ключ %08lX: нет подключа для отзыва ключа\n"
+
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "ключ %08lX: неправильный отзыв подключа\n"
+
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "ключ %08lX: удален многократный отзыв подключа\n"
+
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "ключ %08lX: пропущен User ID '"
+
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "ключ %08lX: пропущен подключ\n"
+
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "ключ %08lX: не экспортируемая подпись (класс %02x) - пропущена\n"
+
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "ключ %08lX: сертификат отзыва в неправильном месте - пропущен\n"
+
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "ключ %08lX: неправильный сертификат отзыва: %s - пропущен\n"
+
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "ключ %08lX: подпись подключа в неправильном месте - пропущена\n"
+
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "ключ %08lX: неизвестный класс подписи (0x%02X) - пропущена\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "ключ %08lX: обнаружено дублирование User ID - объединены\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "ВНИМАНИЕ: ключ %08lX возможно отозван: запрашиваю ключ отзыва %08lX\n"
+
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "ВНИМАНИЕ: ключ %08lX возможно отозван: ключ отзыва %08lX не получен.\n"
+
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "ключ %08lX: \"%s\" добавлен сертификат отзыва\n"
+
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "ключ %08lX: direct key signature добавлена\n"
+
+#: g10/keyedit.c:159
+msgid "[revocation]"
+msgstr "[отозван]"
+
+#: g10/keyedit.c:160
+msgid "[self-signature]"
+msgstr "[самоподпись]"
+
+#: g10/keyedit.c:237 g10/keylist.c:319
+msgid "1 bad signature\n"
+msgstr "1 плохая подпись\n"
+
+#: g10/keyedit.c:239 g10/keylist.c:321
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d плохих подписей\n"
+
+#: g10/keyedit.c:241 g10/keylist.c:323
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 подпись не проверена за отсутствием ключа\n"
+
+#: g10/keyedit.c:243 g10/keylist.c:325
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d подписей не проверено за отсутствием ключей\n"
+
+#: g10/keyedit.c:245 g10/keylist.c:327
+msgid "1 signature not checked due to an error\n"
+msgstr "1 подпись не проверена из-за ошибки\n"
+
+#: g10/keyedit.c:247 g10/keylist.c:329
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d подписей не проверено из-за ошибок\n"
+
+#: g10/keyedit.c:249
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "обнаружен 1 User ID без действительной самоподписи\n"
+
+#: g10/keyedit.c:251
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "обнаружено %d User ID без действительной самоподписи\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Доверяю ограниченно\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Полностью доверяю\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID \"%s\" отозван."
+
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Вы уверены, что хотите это подписать? (y/N) "
+
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
+msgid "  Unable to sign.\n"
+msgstr "  Не могу подписать.\n"
+
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Срок действия User ID \"%s\" истек."
+
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID \"%s\" без самоподписи."
+
+#: g10/keyedit.c:584
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Самоподпись у \"%s\"\n"
+"это подпись PGP 2.x -стиля.\n"
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Ваша текущая подпись на  \"%s\"\n"
+"просрочена.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
+
+#: g10/keyedit.c:632
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"Ваша текущая подпись на \"%s\"\n"
+"является локальной.\n"
+
+#: g10/keyedit.c:636
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
+
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" уже был локально подписан ключом %08lX\n"
+
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" уже был подписан ключом %08lX\n"
+
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Вы действительно хотите снова подписать это? (y/N)"
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Нечего подписывать ключом %08lX\n"
+
+#: g10/keyedit.c:702
+msgid "This key has expired!"
+msgstr "Данный ключ просрочен!"
+
+#: g10/keyedit.c:722
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "Срок действия данного ключа истекает %s.\n"
+
+#: g10/keyedit.c:726
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr ""
+"Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
+
+#: g10/keyedit.c:759
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Вы не можете сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
+
+#: g10/keyedit.c:761
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
+
+#: g10/keyedit.c:786
+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 ""
+"Как хорошо Вы проверили то, что ключ действительно принадлежит человеку,\n"
+"чье имя указано в User ID ключа?\n"
+"  Если Вы не знаете что ответить, введите \"0\".\n"
+
+#: g10/keyedit.c:791
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr "   (0) Не буду отвечать.%s\n"
+
+#: g10/keyedit.c:793
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr "   (1) Я не проверял совсем.%s\n"
+
+#: g10/keyedit.c:795
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr "   (2) Я проверил частично.%s\n"
+
+#: g10/keyedit.c:797
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) Я проверил очень тщательно.%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Ваш выбор? (введите '?' для большей информации): "
+
+#: g10/keyedit.c:826
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Вы уверены, что хотите подписать этот ключ\n"
+"своим ключом: \""
+
+#: g10/keyedit.c:835
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"\n"
+"Это будет самоподпись.\n"
+
+#: g10/keyedit.c:839
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
+
+#: g10/keyedit.c:844
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
+
+#: g10/keyedit.c:851
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Подпись будет помечена как не экспортируемая.\n"
+
+#: g10/keyedit.c:855
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Подпись будет помечена как не отзываемая.\n"
+
+#: g10/keyedit.c:860
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+"\n"
+"Я не проверял этот ключ совсем.\n"
+
+#: g10/keyedit.c:864
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+"\n"
+"Я частично проверил этот ключ.\n"
+
+#: g10/keyedit.c:868
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+"\n"
+"Я очень тщательно проверил этот ключ.\n"
+
+#: g10/keyedit.c:877
+msgid "Really sign? "
+msgstr "Действительно подписать? "
+
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "не удалось подписать: %s\n"
+
+#: g10/keyedit.c:978
+msgid "This key is not protected.\n"
+msgstr "Данный ключ не защищен.\n"
+
+#: g10/keyedit.c:982
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Секретная часть главного ключа отсутствует.\n"
+
+#: g10/keyedit.c:986
+msgid "Key is protected.\n"
+msgstr "Ключ защищен.\n"
+
+#: g10/keyedit.c:1006
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Не могу редактировать данный ключ: %s\n"
+
+#: g10/keyedit.c:1012
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Введите новый пароль для данного секретного ключа.\n"
+"\n"
+
+#: g10/keyedit.c:1026
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
+"\n"
+
+#: g10/keyedit.c:1029
+msgid "Do you really want to do this? "
+msgstr "Вы действительно хотите сделать это? "
+
+#: g10/keyedit.c:1095
+msgid "moving a key signature to the correct place\n"
+msgstr "перемещение подписи ключа в правильное место\n"
+
+#: g10/keyedit.c:1138
+msgid "quit this menu"
+msgstr "выйти из этого меню"
+
+#: g10/keyedit.c:1139
+msgid "q"
+msgstr "q"
+
+#: g10/keyedit.c:1140
+msgid "save"
+msgstr "save"
+
+#: g10/keyedit.c:1140
+msgid "save and quit"
+msgstr "сохранить и выйти"
+
+#: g10/keyedit.c:1141
+msgid "help"
+msgstr "help"
+
+#: g10/keyedit.c:1141
+msgid "show this help"
+msgstr "показать эту справку"
+
+#: g10/keyedit.c:1143
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:1143
+msgid "show fingerprint"
+msgstr "показать отпечаток"
+
+#: g10/keyedit.c:1144
+msgid "list"
+msgstr "list"
+
+#: g10/keyedit.c:1144
+msgid "list key and user IDs"
+msgstr "вывести список ключей и User ID"
+
+#: g10/keyedit.c:1145
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:1146
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:1146
+msgid "select user ID N"
+msgstr "выбрать User ID N"
+
+#: g10/keyedit.c:1147
+msgid "key"
+msgstr "key"
+
+#: g10/keyedit.c:1147
+msgid "select secondary key N"
+msgstr "выбрать вторичный ключ N"
+
+#: g10/keyedit.c:1148
+msgid "check"
+msgstr "check"
+
+#: g10/keyedit.c:1148
+msgid "list signatures"
+msgstr "вывести список подписей"
+
+#: g10/keyedit.c:1149
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:1150
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:1150
+msgid "sign the key"
+msgstr "подписать ключ"
+
+#: g10/keyedit.c:1151
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "создать отделенную (detached) подпись"
+
+#: g10/keyedit.c:1153
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:1153
+msgid "sign the key locally"
+msgstr "локально подписать ключ"
+
+#: g10/keyedit.c:1154
+msgid "nrsign"
+msgstr "nrsign"
+
+#: g10/keyedit.c:1154
+msgid "sign the key non-revocably"
+msgstr "подписать ключ без возможности отзыва"
+
+#: g10/keyedit.c:1155
+msgid "nrlsign"
+msgstr "nrlsign"
+
+#: g10/keyedit.c:1155
+msgid "sign the key locally and non-revocably"
+msgstr "подписать ключ локально и без возможности отзыва"
+
+#: g10/keyedit.c:1156
+msgid "debug"
+msgstr "debug"
+
+#: g10/keyedit.c:1157
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:1157
+msgid "add a user ID"
+msgstr "добавить User ID"
+
+#: g10/keyedit.c:1158
+msgid "addphoto"
+msgstr "addphoto"
+
+#: g10/keyedit.c:1158
+msgid "add a photo ID"
+msgstr "добавить фото ID"
+
+#: g10/keyedit.c:1159
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:1159
+msgid "delete user ID"
+msgstr "удалить User ID"
+
+#: g10/keyedit.c:1161
+msgid "delphoto"
+msgstr "delphoto"
+
+#: g10/keyedit.c:1162
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1162
+msgid "add a secondary key"
+msgstr "добавить вторичный ключ"
+
+#: g10/keyedit.c:1163
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:1163
+msgid "delete a secondary key"
+msgstr "удалить вторичный ключ"
+
+#: g10/keyedit.c:1164
+msgid "addrevoker"
+msgstr "addrevoker"
+
+#: g10/keyedit.c:1164
+msgid "add a revocation key"
+msgstr "добавить ключ отзыва"
+
+#: g10/keyedit.c:1165
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:1165
+msgid "delete signatures"
+msgstr "удалить подпись"
+
+#: g10/keyedit.c:1166
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:1166
+msgid "change the expire date"
+msgstr "сменить срок действия"
+
+#: g10/keyedit.c:1167
+msgid "primary"
+msgstr "primary"
+
+#: g10/keyedit.c:1167
+msgid "flag user ID as primary"
+msgstr "пометить User ID как главный"
+
+#: g10/keyedit.c:1168
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:1168
+msgid "toggle between secret and public key listing"
+msgstr "переключение между открытым и закрытым ключами"
+
+#: g10/keyedit.c:1170
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:1171
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:1171
+msgid "list preferences (expert)"
+msgstr "список предпочтений (экспертам)"
+
+#: g10/keyedit.c:1172
+msgid "showpref"
+msgstr "showpref"
+
+#: g10/keyedit.c:1172
+msgid "list preferences (verbose)"
+msgstr "список предпочтений (подробный)"
+
+#: g10/keyedit.c:1173
+msgid "setpref"
+msgstr "setpref"
+
+#: g10/keyedit.c:1173
+msgid "set preference list"
+msgstr "установить предпочтения"
+
+#: g10/keyedit.c:1174
+msgid "updpref"
+msgstr "updpref"
+
+#: g10/keyedit.c:1174
+msgid "updated preferences"
+msgstr "обновить предпочтения"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "ошибка сервера ключей"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "не могу проанализировать URI сервера ключей\n"
+
+#: g10/keyedit.c:1176
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:1176
+msgid "change the passphrase"
+msgstr "сменить пароль"
+
+#: g10/keyedit.c:1177
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:1177
+msgid "change the ownertrust"
+msgstr "изменить уровень доверия владельцу"
+
+#: g10/keyedit.c:1178
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:1178
+msgid "revoke signatures"
+msgstr "отзыв подписей"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "отзыв User ID"
+
+#: g10/keyedit.c:1180
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:1180
+msgid "revoke a secondary key"
+msgstr "отзыв подключей"
+
+#: g10/keyedit.c:1181
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:1181
+msgid "disable a key"
+msgstr "отключить ключ"
+
+#: g10/keyedit.c:1182
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:1182
+msgid "enable a key"
+msgstr "включить ключ"
+
+#: g10/keyedit.c:1183
+msgid "showphoto"
+msgstr "showphoto"
+
+#: g10/keyedit.c:1183
+msgid "show photo ID"
+msgstr "показать фото ID"
+
+#: g10/keyedit.c:1202 g10/delkey.c:120
+msgid "can't do that in batchmode\n"
+msgstr "не могу делать это в пакетном режиме\n"
+
+#: g10/keyedit.c:1233
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "ошибка чтения секретного блока ключа `%s': %s\n"
+
+#: g10/keyedit.c:1250
+msgid "Secret key is available.\n"
+msgstr "Секретный ключ доступен.\n"
+
+#: g10/keyedit.c:1282
+msgid "Command> "
+msgstr "Команда> "
+
+#: g10/keyedit.c:1312
+msgid "Need the secret key to do this.\n"
+msgstr "Для данного действия нужен секретный ключ.\n"
+
+#: g10/keyedit.c:1316
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
+
+#: g10/keyedit.c:1364
+msgid "Key is revoked."
+msgstr "Ключ отозван."
+
+#: g10/keyedit.c:1383
+msgid "Really sign all user IDs? "
+msgstr "Вы действительно хотите подписать ВСЕ User ID? "
+
+#: g10/keyedit.c:1384
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Подсказка: Выберите User IDs для подписи\n"
+
+#: g10/keyedit.c:1409
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "Данная команда не допустима в режиме %s.\n"
+
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+msgid "You must select at least one user ID.\n"
+msgstr "Вы должны выбрать хотя бы один User ID.\n"
+
+#: g10/keyedit.c:1433
+msgid "You can't delete the last user ID!\n"
+msgstr "Вы не можете удалить последний User ID!\n"
+
+#: g10/keyedit.c:1436
+msgid "Really remove all selected user IDs? "
+msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? "
+
+#: g10/keyedit.c:1437
+msgid "Really remove this user ID? "
+msgstr "Вы действительно хотите удалить данный User ID? "
+
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
+msgid "You must select at least one key.\n"
+msgstr "Вы должны выбрать хотя бы один ключ.\n"
+
+#: g10/keyedit.c:1478
+msgid "Do you really want to delete the selected keys? "
+msgstr "Вы действительно хотите удалить выбранные ключи? "
+
+#: g10/keyedit.c:1479
+msgid "Do you really want to delete this key? "
+msgstr "Вы действительно хотите удалить данный ключ? "
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Действительно отозвать ВСЕ выбранные User ID? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Действительно отозвать данный User ID? "
+
+#: g10/keyedit.c:1534
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Вы действительно хотите отозвать выбранные ключи? "
+
+#: g10/keyedit.c:1535
+msgid "Do you really want to revoke this key? "
+msgstr "Вы действительно хотите отозвать данный ключ? "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "установить предпочтения"
+
+#: g10/keyedit.c:1612
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Действительно обновить предпочтения для выбранных User ID? "
+
+#: g10/keyedit.c:1614
+msgid "Really update the preferences? "
+msgstr "Действительно обновить предпочтения? "
+
+#: g10/keyedit.c:1662
+msgid "Save changes? "
+msgstr "Сохранить изменения? "
+
+#: g10/keyedit.c:1665
+msgid "Quit without saving? "
+msgstr "Выйти без сохранения? "
+
+#: g10/keyedit.c:1675
+#, c-format
+msgid "update failed: %s\n"
+msgstr "сбой при обновлении: %s\n"
+
+#: g10/keyedit.c:1682
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "сбой при обновлений секретного ключа: %s\n"
+
+#: g10/keyedit.c:1689
+msgid "Key not changed so no update needed.\n"
+msgstr "ключ не изменялся - обновление не нужно.\n"
+
+#: g10/keyedit.c:1701
+msgid "Invalid command  (try \"help\")\n"
+msgstr "Недопустимая команда  (список команд: \"help\")\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Хэш-функции: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Опции: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr "Данный ключ может быть отозван ключом %s "
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr " (sensitive)"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "не могу создать %s: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[отозван]"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [годен до: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [годен до: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " доверие: %c/%c"
+
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
+msgid "This key has been disabled"
+msgstr "Данный ключ отключен"
+
+#: g10/keyedit.c:2146
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! подключ отозван: %s\n"
+
+#: g10/keyedit.c:2149
+msgid "rev- faked revocation found\n"
+msgstr "rev- найден поддельный отзыв\n"
+
+#: g10/keyedit.c:2151
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? проблема проверки отзыва: %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[отозван]"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
+
+#: g10/keyedit.c:2207
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"Заметьте, что показанные степени достоверности могут быть неверными,\n"
+"пока Вы не перезапустите программу.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[отозван]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[просрочен]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"ВНИМАНИЕ: нет User ID отмеченного как главный.  Данная команда может\n"
+"              использовать другой User ID в качестве главного.\n"
+
+#: g10/keyedit.c:2399
+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 ""
+"ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
+"         PGP вызвать выбраковку ключа.\n"
+
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Вы уверены, что хотите добавить это? (y/N) "
+
+#: g10/keyedit.c:2410
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "Вы можете не добавлять фото ID в ключ PGP2-типа.\n"
+
+#: g10/keyedit.c:2545
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Удалить данную действительную подпись? (y/N/q)"
+
+#: g10/keyedit.c:2555
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Удалить данную недействительную подпись? (y/N/q)"
+
+#: g10/keyedit.c:2559
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Удалить данную неизвестную подпись? (y/N/q)"
+
+#: g10/keyedit.c:2565
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Действительно удалить данную самоподпись? (y/N)"
+
+#: g10/keyedit.c:2579
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Удалена %d подпись.\n"
+
+#: g10/keyedit.c:2580
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Удалено %d подписи.\n"
+
+#: g10/keyedit.c:2583
+msgid "Nothing deleted.\n"
+msgstr "Ничего не удалено.\n"
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
+"          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
+
+#: g10/keyedit.c:2703
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Укажите User ID ключа, назначенного отзывающим: "
+
+#: g10/keyedit.c:2726
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "нельзя назначить PGP 2.x ключ, как назначенный отзывающим\n"
+
+#: g10/keyedit.c:2741
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "ключ не может быть назначен отзывающим сам себя\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "ВНИМАНИЕ: Данный ключ отозван отзывающим ключом!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "ВНИМАНИЕ: назначение ключа отзывающим не возможно будет отменить!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N): "
+
+#: g10/keyedit.c:2849
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Снимите выделение с секретного ключа.\n"
+
+#: g10/keyedit.c:2855
+msgid "Please select at most one secondary key.\n"
+msgstr "Выделите не более одного вторичного ключа.\n"
+
+#: g10/keyedit.c:2859
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Смена срока действия вторичного ключа.\n"
+
+#: g10/keyedit.c:2862
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Смена срока действия главного ключа\n"
+
+#: g10/keyedit.c:2908
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "Вы не можете изменить срок действия v3 ключа\n"
+
+#: g10/keyedit.c:2924
+msgid "No corresponding signature in secret ring\n"
+msgstr "Нет соответствующей подписи в связке секретных\n"
+
+#: g10/keyedit.c:3004
+msgid "Please select exactly one user ID.\n"
+msgstr "Выберите только один User ID.\n"
+
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "Нет User ID с индексом %d\n"
+
+#: g10/keyedit.c:3377
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "Нет вторичного ключа с индексом %d\n"
+
+#: g10/keyedit.c:3491
+msgid "user ID: \""
+msgstr "User ID: \""
+
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"подписанный Вашим ключом %08lX  %s\n"
+
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"подписан локально Вашим ключом %08lX  %s\n"
+
+#: g10/keyedit.c:3504
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "Срок подписи закончился %s.\n"
+
+#: g10/keyedit.c:3508
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Вы уверены, что хотите отозвать? (y/N) "
+
+#: g10/keyedit.c:3512
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
+
+#: g10/keyedit.c:3537
+msgid "You have signed these user IDs:\n"
+msgstr "Вы подписали данные User ID:\n"
+
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   подписан %08lX  %s%s%s\n"
+
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   отозван %08lX  %s\n"
+
+#: g10/keyedit.c:3587
+msgid "You are about to revoke these signatures:\n"
+msgstr "Вы отзываете следующие подписи:\n"
+
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr "   подписан %08lX  %s%s\n"
+
+#: g10/keyedit.c:3599
+msgid " (non-exportable)"
+msgstr " (не экспортируемая)"
+
+#: g10/keyedit.c:3606
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Действительно создать сертификат отзыва? (y/N) "
+
+#: g10/keyedit.c:3636
+msgid "no secret key\n"
+msgstr "нет секретного ключа\n"
+
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "User ID \"%s\" уже отозван\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "Показ %s фото ID размера %ld для ключа 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:179
+msgid "Critical signature policy: "
+msgstr "Критические правила для подписи: "
+
+#: g10/keylist.c:181
+msgid "Signature policy: "
+msgstr "Правила для подписи: "
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
+msgid "WARNING: invalid notation data found\n"
+msgstr "ВНИМАНИЕ: найдена недопустимая форма записи данных\n"
+
+#: g10/keylist.c:286
+msgid "Critical signature notation: "
+msgstr "Критическое примечание к подписи: "
+
+#: g10/keylist.c:288
+msgid "Signature notation: "
+msgstr "Примечание к подписи"
+
+#: g10/keylist.c:299
+msgid "not human readable"
+msgstr "нечитаемо для человека"
+
+#: g10/keylist.c:400
+msgid "Keyring"
+msgstr "Таблица ключей"
+
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [годен до: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
+msgid " [expires: %s]"
+msgstr " [годен до: %s]"
+
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[отозван]"
+
+#: g10/keylist.c:1357
+msgid "Primary key fingerprint:"
+msgstr " Отпечаток главного ключа:"
+
+#: g10/keylist.c:1359
+msgid "     Subkey fingerprint:"
+msgstr "         Отпечаток подключа:"
+
+#: g10/keylist.c:1366
+msgid " Primary key fingerprint:"
+msgstr " Отпечаток главного ключа:"
+
+#: g10/keylist.c:1368
+msgid "      Subkey fingerprint:"
+msgstr "         Отпечаток подключа:"
+
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr "     Отпечаток ключа ="
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "странный размер сеансового ключа шифрования (%d)\n"
+
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "плохой пароль или неизвестный алгоритм шифрования (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s зашифрованный сеансовый ключ\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "Данные зашифрованы алгоритмом %s\n"
+
+#: g10/mainproc.c:305 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "зашифровано неизвестный алгоритмом %d\n"
+
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "зашифровано неизвестный алгоритмом %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "открытый ключ %08lX\n"
+
+#: g10/mainproc.c:428
+msgid "public key encrypted data: good DEK\n"
+msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
+
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "зашифровано %u-битным ключом %s, ID %08lX, созданным %s\n"
+
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "зашифрован ключом %s, ID %08lX\n"
+
+#: g10/mainproc.c:486
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "сбой расшифрования с открытым ключом: %s\n"
+
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "зашифровано %lu паролями\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "зашифровано 1 паролем\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "принятие %s зашифрованных данных\n"
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
+
+#: g10/mainproc.c:570
+msgid "decryption okay\n"
+msgstr "Расшифровано\n"
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
+
+#: g10/mainproc.c:587
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
+
+#: g10/mainproc.c:593
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "сбой расшифрования: %s\n"
+
+#: g10/mainproc.c:613
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "ЗАМЕТЬТЕ: отправитель требует \"только для просмотра Вами\"\n"
+
+#: g10/mainproc.c:615
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "оригинальное имя файла='%.*s'\n"
+
+#: g10/mainproc.c:787
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
+
+#: g10/mainproc.c:1283
+msgid "signature verification suppressed\n"
+msgstr "проверка подписи подавлена\n"
+
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
+msgid "can't handle these multiple signatures\n"
+msgstr "не могу обработать эти множественные подписи\n"
+
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Подпись просрочена %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                aka \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Подпись создана %.*s ключом %s с ID %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Ключ доступен: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr "ПЛОХАЯ подпись от \""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
+msgid "Expired signature from \""
+msgstr "Просроченная подпись от \""
+
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
+msgid "Good signature from \""
+msgstr "Действительная подпись от \""
+
+#: g10/mainproc.c:1510
+msgid "[uncertain]"
+msgstr "[сомнительно]"
+
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                aka \""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Подпись просрочена %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Подпись действительна до %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s подпись, хэш-функция %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "двоичный"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "текстовый"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "неизвестен"
+
+#: g10/mainproc.c:1668
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Не могу проверить подпись: %s\n"
+
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
+msgid "not a detached signature\n"
+msgstr "не отделенная подпись\n"
+
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "ВНИМАНИЕ: обнаружено много подписей.  Только первая будет проверена.\n"
+
+#: g10/mainproc.c:1787
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "самостоятельная подпись класса 0x%02x\n"
+
+#: g10/mainproc.c:1844
+msgid "old style (PGP 2.x) signature\n"
+msgstr "старый (PGP 2.x) стиль подписи\n"
+
+#: g10/mainproc.c:1854
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
+
+#: g10/misc.c:82
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "не могу отключить создание образа памяти (core dumps): %s\n"
+
+#: g10/misc.c:146
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Использовать экспериментальные алгоритмы не рекомендуется!\n"
+
+#: g10/misc.c:176
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+"не рекомендуем данный алгоритм шифрования; используйте более стандартный!\n"
+
+#: g10/misc.c:282
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "модуль поддержки шифра IDEA не обнаружен\n"
+
+#: g10/misc.c:283
+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/misc.c:491
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
+
+#: g10/misc.c:495
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
+
+#: g10/misc.c:497
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "используйте \"%s%s\" взамен\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "не сжато"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "не сжато"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "данное сообщение может быть не пригодно для %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "настройки взяты из файла `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "неизвестный получатель по умолчанию `%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:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"ВНИМАНИЕ: потенциально небезопасный симметрично зашифрованный сеансовый "
+"ключ\n"
+
+#: g10/parse-packet.c:1128
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "подпакет типа %d имеет выставленный критический бит\n"
+
+#: g10/passphrase.c:461 g10/passphrase.c:508
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent недоступен в данной сессии\n"
+
+#: g10/passphrase.c:469
+msgid "can't set client pid for the agent\n"
+msgstr "не могу установить pid для агента\n"
+
+#: g10/passphrase.c:477
+msgid "can't get server read FD for the agent\n"
+msgstr "не могу получить дескриптор чтения для агента\n"
+
+#: g10/passphrase.c:484
+msgid "can't get server write FD for the agent\n"
+msgstr "не могу получить дескриптор записи для агента\n"
+
+#: g10/passphrase.c:517
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
+
+#: g10/passphrase.c:530
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "протокол gpg-agent версии %d не поддерживается\n"
+
+#: g10/passphrase.c:551
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "не могу подключиться к `%s': %s\n"
+
+#: g10/passphrase.c:573
+msgid "communication problem with gpg-agent\n"
+msgstr "коммуникационный проблемы с gpg-agent\n"
+
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+msgid "problem with the agent - disabling agent use\n"
+msgstr "проблема с агентом - использование агента отключено\n"
+
+#: g10/passphrase.c:681
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (главный идентификатор ключа %08lX)"
+
+#: g10/passphrase.c:691
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Необходим пароль для доступа к секретному ключу пользователя:\n"
+"\"%.*s\"\n"
+"%u-бит %s ключ, ID %08lX, создан %s%s\n"
+
+#: g10/passphrase.c:713
+msgid "Repeat passphrase\n"
+msgstr "Повторите пароль\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Введите пароль\n"
+
+#: g10/passphrase.c:753
+msgid "passphrase too long\n"
+msgstr "пароль слишком длинный\n"
+
+#: g10/passphrase.c:766
+msgid "invalid response from agent\n"
+msgstr "неверный ответ от агента\n"
+
+#: g10/passphrase.c:781 g10/passphrase.c:874
+msgid "cancelled by user\n"
+msgstr "прервано пользователем\n"
+
+#: g10/passphrase.c:786 g10/passphrase.c:963
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "проблема с агентом: агент вернул 0x%lx\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "не могу получить пароль в пакетном режиме\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Введите пароль: "
+
+#: g10/passphrase.c:1131
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Необходим пароль для доступа к секретному ключу пользователя:\n"
+"\""
+
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-бит %s ключ, ID %08lX, создан %s"
+
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (главный идентификатор ключа %08lX)"
+
+#: g10/passphrase.c:1213
+msgid "Repeat passphrase: "
+msgstr "Повторите пароль: "
+
+#: g10/plaintext.c:90
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
+
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "ошибка создания `%s': %s\n"
+
+#: g10/plaintext.c:438
+msgid "Detached signature.\n"
+msgstr "Отделенная подпись.\n"
+
+#: g10/plaintext.c:442
+msgid "Please enter name of data file: "
+msgstr "Введите имя файла с данными: "
+
+#: g10/plaintext.c:463
+msgid "reading stdin ...\n"
+msgstr "читаю stdin ...\n"
+
+#: g10/plaintext.c:497
+msgid "no signed data\n"
+msgstr "нет подписанных данных\n"
+
+#: g10/plaintext.c:505
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "не могу открыть подписанные данные `%s'\n"
+
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "анонимный получатель; пробую секретный ключ %08lX ...\n"
+
+#: g10/pubkey-enc.c:119
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "Отлично, мы анонимный получатель.\n"
+
+#: g10/pubkey-enc.c:207
+msgid "old encoding of the DEK is not supported\n"
+msgstr "старое шифрование DEK не поддерживается\n"
+
+#: g10/pubkey-enc.c:228
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
+
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "ЗАМЕТЬТЕ: алгоритм шифрования %d не найден в списке предпочтений\n"
+
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "ЗАМЕТЬТЕ: секретный ключ %08lX просрочен с %s\n"
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "ЗАМЕТЬТЕ: ключ был отозван"
+
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr "части секретного ключа не доступны\n"
+
+#: g10/seckey-cert.c:60
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "метод защиты %d%s не поддерживается\n"
+
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "метод защиты %d%s не поддерживается\n"
+
+#: g10/seckey-cert.c:250
+msgid "Invalid passphrase; please try again"
+msgstr "Неверный пароль; попробуйте еще раз"
+
+#: g10/seckey-cert.c:251
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:311
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "ВНИМАНИЕ: обнаружен слабый ключ - смените пароль еще раз.\n"
+
+#: g10/seckey-cert.c:349
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+"создание нерекомендуемой 16-битной контрольной суммы для защиты ключа\n"
+
+#: g10/sig-check.c:75
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "ВНИМАНИЕ: конфликт хэшей подписей в сообщении\n"
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr ""
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "ВНИМАНИЕ: назначение ключа отзывающим не возможно будет отменить!\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "открытый ключ %08lX на %lu секунд новее подписи\n"
+
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "открытый ключ %08lX на %lu секунд новее подписи\n"
+
+#: g10/sig-check.c:180
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
+
+#: g10/sig-check.c:182
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"ключ был создан на %lu секунд в будущем (time warp или проблемы с часами)\n"
+
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "ЗАМЕТЬТЕ: ключ подписи %08lX - просрочен %s\n"
+
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "принята плохая подпись ключа %08lX с неизвестным критическим битом\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "ключ %08lX: нет подключа для подключа отзывающего пакета\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "ключ %08lX: нет подключа для подписи связи подключей\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "не могу поместить данные в подписи v3 (PGP 2.x)\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "не могу поместить данные в подписи ключей v3 (PGP 2.x)\n"
+
+#: g10/sign.c:112
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"ВНИМАНИЕ: не могу развернуть %% в примечании (слишком длинное). Использую "
+"неразвернутым.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "не могу поместить URL правил в подписи v3 (PGP 2.x)\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "не могу поместить URL правил в подписи ключей v3 (PGP 2.x)\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"ВНИМАНИЕ: не могу раскрыть %% в url правил (слишком длинный). Использую "
+"неразвернутым.\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"ВНИМАНИЕ: не могу раскрыть %% в url правил (слишком длинный). Использую "
+"неразвернутым.\n"
+
+#: g10/sign.c:364
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "сбой проверки созданной подписи: %s\n"
+
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s подпись от: \"%s\"\n"
+
+#: g10/sign.c:550
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
+
+#: g10/sign.c:741
+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:765 g10/sign.c:1001
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "не могу создать %s: %s\n"
+
+#: g10/sign.c:794
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "использование хэш-функции %s (%d) нарушает предпочтения получателя\n"
+
+#: g10/sign.c:886
+msgid "signing:"
+msgstr "подписывание:"
+
+#: g10/sign.c:985
+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:1138
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "будет использовано %s шифрование\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "не могу обработать строки текста длиннее %d символов\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "строка ввода длиннее %d символов\n"
+
+#: g10/tdbio.c:128 g10/tdbio.c:1434
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek failed: %s\n"
+
+#: g10/tdbio.c:134 g10/tdbio.c:1441
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
+#: g10/tdbio.c:497
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: нет доступа: %s\n"
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: каталог не существует!\n"
+
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: не могу заблокировать\n"
+
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: не могу заблокировать\n"
+
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: невозможно создать: %s\n"
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: сбой создания записи о версии: %s"
+
+#: g10/tdbio.c:549
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: создана недействительная таблица доверий\n"
+
+#: g10/tdbio.c:552
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: создана таблица доверий\n"
+
+#: g10/tdbio.c:592
+msgid "NOTE: trustdb not writable\n"
+msgstr "ЗАМЕТЬТЕ: таблица доверий доступна только для чтения\n"
+
+#: g10/tdbio.c:608
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: недействительная таблица доверий\n"
+
+#: g10/tdbio.c:640
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: сбой создания таблицы хэшей: %s\n"
+
+#: g10/tdbio.c:648
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: ошибка обновления записи о версии: %s\n"
+
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: ошибка чтения записи о версии: %s\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: ошибка сохранения записи о версии: %s\n"
+
+#: g10/tdbio.c:1163
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
+#: g10/tdbio.c:1171
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
+#: g10/tdbio.c:1192
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: не является файлом таблицы доверий\n"
+
+#: g10/tdbio.c:1210
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: запись о версии с номером записи %lu\n"
+
+#: g10/tdbio.c:1215
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: неправильная версия файла %d\n"
+
+#: g10/tdbio.c:1400
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: ошибка чтения свободной записи: %s\n"
+
+#: g10/tdbio.c:1408
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: ошибка внесения записи каталога: %s\n"
+
+#: g10/tdbio.c:1418
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: сбой обнуления записи: %s\n"
+
+#: g10/tdbio.c:1448
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: сбой добавления записи: %s\n"
+
+#: g10/tdbio.c:1493
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "`%s' не является допустимым длинным ID ключа\n"
+
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "ключ %08lX: принят как доверяемый ключ\n"
+
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "ключ %08lX встречается более одного раза в таблице доверий\n"
+
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "ключ %08lX: нет открытого ключа для доверяемого ключа - пропущен\n"
+
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "ключ помечен как абсолютно доверяемый.\n"
+
+#: g10/trustdb.c:344
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "запись о доверии %lu, тип запроса %d: сбой чтения: %s\n"
+
+#: g10/trustdb.c:350
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "запись о доверии %lu не запрашиваемого типа %d\n"
+
+#: g10/trustdb.c:365 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
+
+#: g10/trustdb.c:380 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "никогда   "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
+msgid "no need for a trustdb check\n"
+msgstr "нет необходимости в проверке таблицы доверий\n"
+
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "срок следующей проверки таблицы доверий %s\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "нет необходимости в проверке таблицы доверий\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "нет необходимости в проверке таблицы доверий\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "открытый ключ %08lX не найден: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "выполните --check-trustdb, пожалуйста\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "проверка таблицы доверий\n"
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "не найдено абсолютно доверяемых ключей\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "открытый ключ для абсолютно доверяемого ключа %08lX не найден\n"
+
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"Не могу проверить подпись.\n"
+"Файл подписи (.sig или .asc) должен быть\n"
+"первым указан в командной строке.\n"
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "входная строка %u слишком длинная или пропущен LF\n"
+
+#: 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:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "пропущено `%s': дубликат\n"
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "пропущено `%s': %s\n"
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr "пропущено: секретный ключ уже имеется\n"
+
+#: g10/skclist.c:179
+#, fuzzy, c-format
+msgid ""
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"пропущено `%s': это созданный PGP - ElGamal ключ, не обеспечивающий\n"
+"безопасность подписи\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "Файл `%s' существует. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Перезаписать (y/N)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: неизвестное окончание\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Введите новое имя файла"
+
+#: g10/openfile.c:183
+msgid "writing to stdout\n"
+msgstr "Вывод в stdout\n"
+
+#: g10/openfile.c:282
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "принятие подписанных данных в `%s'\n"
+
+#: g10/openfile.c:349
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "создан новый файл настроек `%s'\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны при этом запуске\n"
+
+#: g10/openfile.c:380
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: не могу создать каталог: %s\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: directory created\n"
+msgstr "создан каталог: %s\n"
+
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"ВНИМАНИЕ: сообщение было зашифровано симметричным шифром со слабым ключом.\n"
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr "проблема обработки зашифрованного пакета\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "создан слабый ключ - повторение\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr ""
+"невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
+
+#: g10/seskey.c:210
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA требует использования 160 битной хэш-функции\n"
+
+#: g10/delkey.c:121 g10/delkey.c:128
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(если только Вы не задали ключ отпечатком)\n"
+
+#: g10/delkey.c:127
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "не могу выполнять в пакетном режиме без \"--yes\"\n"
+
+#: g10/delkey.c:139
+msgid "Delete this key from the keyring? "
+msgstr "Удалить данный ключ из таблицы ключей? "
+
+#: g10/delkey.c:147
+msgid "This is a secret key! - really delete? "
+msgstr "Это секретный ключ! - действительно удалить? "
+
+#: g10/delkey.c:157
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "сбой при удалении блока ключа: %s\n"
+
+#: g10/delkey.c:167
+msgid "ownertrust information cleared\n"
+msgstr "информация о доверии владельцу очищена\n"
+
+#: g10/delkey.c:195
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "имеется секретный ключ для открытого ключа \"%s\"!\n"
+
+#: g10/delkey.c:197
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
+
+#: g10/helptext.c:48
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Вы должны ввести здесь значение; оно никогда не будет экспортировано\n"
+"третьей стороне.  Это необходимо для реализации сети доверия (web-of-"
+"trust);\n"
+" и не имеет ничего общего с (неявно созданной) сетью сертификатов."
+
+#: g10/helptext.c:54
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"Для построения Сети Доверия, GnuPG должен знать, к каким ключам\n"
+"имеется абсолютное доверие - обычно это ключи для которых у Вас есть\n"
+"секретный ключ.  Ответьте \"yes\" для присвоения абсолютного доверия\n"
+"данному ключу\n"
+
+#: g10/helptext.c:61
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr "Если Вы хотите использовать данный отозванный ключ - ответьте \"yes\"."
+
+#: g10/helptext.c:65
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+"Если Вы хотите использовать данный недоверяемый ключ - ответьте \"yes\"."
+
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Введите User ID адресата, которому Вы хотите отправить сообщение."
+
+#: g10/helptext.c:73
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+
+#: g10/helptext.c:87
+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 ""
+"Обычно не рекомендуется использовать один ключ для подписи и шифрования\n"
+"Данный алгоритм может использоваться только в некоторых случаях.\n"
+"Проконсультируйтесь с Вашим экспертом по безопасности перед тем,\n"
+"как использовать данный ключ."
+
+#: g10/helptext.c:94
+msgid "Enter the size of the key"
+msgstr "Введите размер ключа"
+
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
+msgid "Answer \"yes\" or \"no\""
+msgstr "Ответьте \"yes\" или \"no\""
+
+#: g10/helptext.c:108
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Введите требуемое значение, как показано в подсказке.\n"
+"Можно ввести ISO дату (YYYY-MM-DD), но Вы не \n"
+"получите сообщение об ошибке - вместо этого система попробует\n"
+"расшифровать это значение как интервал."
+
+#: g10/helptext.c:120
+msgid "Enter the name of the key holder"
+msgstr "Введите имя владельца ключа"
+
+#: g10/helptext.c:125
+msgid "please enter an optional but highly suggested email address"
+msgstr "введите необязательный, но очень рекомендуемый email адрес"
+
+#: g10/helptext.c:129
+msgid "Please enter an optional comment"
+msgstr "Введите необязательный комментарий"
+
+#: g10/helptext.c:134
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N  изменить имя.\n"
+"C  изменить комментарий.\n"
+"E  изменить email адрес.\n"
+"O  продолжить создание ключа.\n"
+"Q  выйти и прервать создание ключа."
+
+#: g10/helptext.c:143
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "Ответьте \"yes\" (или только \"y\"), если Вы готовы создавать подключ."
+
+#: g10/helptext.c:151
+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"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"Когда Вы подписываете User ID ключа, Вы должны сначала удостовериться, что\n"
+"ключ принадлежит человеку указанному в User ID.  Это нужно для тех,\n"
+"кто знает как хорошо Вы проверяете достоверность User ID.\n"
+"\n"
+"\"0\" означает, что Вы не можете сказать, как хорошо Вы проверили ключ.\n"
+"\"1\" означает, что Вы полагаете, что ключ принадлежит человеку, который\n"
+"    указан в нем, но Вы не могли или не проводили полную проверку ключа.\n"
+"    Это полезно, когда Вы подписываете ключ с псевдонимом человека.\n"
+"\n"
+"\"2\" означает, что Вы делали неаккуратную проверку ключа.  Например, это "
+"может\n"
+"    означать, что Вы проверили отпечаток ключа и проверили User ID на\n"
+"    ключе на основании фото ID.\n"
+"\n"
+"\"3\" означает, что Вы выполнили всестороннюю проверку ключа.  Например, это "
+"может\n"
+"    означать, что Вы сверили отпечаток ключа с владельцем ключа лично\n"
+"    и что Вы сверили все посредством трудноподделываемого документа с\n"
+"    фото ID (таким как паспорт), что имя владельца ключа совпадает с\n"
+"    именем в User ID ключа и наконец, что Вы проверили (обменом\n"
+"    письмами), что email адрес на ключе принадлежит владельцу ключа.\n"
+"\n"
+"Заметьте, что примеры данные для уровней 2 и 3 - только примеры.\n"
+"Наконец, Вам решать что считать \"неаккуратно\" и \"всесторонне\"\n"
+"для Вас, когда Вы подписываете другие ключи.\n"
+"\n"
+"Если Вы не можете определиться с правильным ответом, ответьте \"0\"."
+
+#: g10/helptext.c:189
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "Ответьте \"yes\", если Вы хотите подписать ВСЕ User ID"
+
+#: g10/helptext.c:193
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Ответьте \"yes\", если Вы действительно хотите удалить данный User ID.\n"
+"Все сертификаты также будут потеряны!"
+
+#: g10/helptext.c:198
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Ответьте \"yes\", если Вы готовы удалить подключ"
+
+#: g10/helptext.c:203
+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 ""
+"Это действительная подпись на ключе; обычно не желательно\n"
+"удалять такие подписи, потому, что она может быть важна для установления\n"
+"достоверности ключа или других ключей подписанных данным ключом."
+
+#: g10/helptext.c:208
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"Данная подпись не может быть проверена потому Вы не имеете\n"
+"соответствующего ключа.  Вы можете отложить ее удаление, пока Вы не\n"
+"узнаете, какой ключ был использован, т.к. эта подпись может\n"
+"устанавливать достоверность через другие уже удостоверенные ключи."
+
+#: g10/helptext.c:214
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+"Подпись недействительна.  Это дает основания удалить ее из\n"
+"Вашей связки ключей."
+
+#: g10/helptext.c:218
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"Данная подпись является самоподписью и привязывает User ID к ключу.\n"
+"Обычно плохая идея удалять такую подпись.  На самом деле\n"
+"GnuPG может не позволить использовать такой ключ далее.\n"
+"Делайте это только если данная самоподпись не действительна по\n"
+"каким-то причинам и существует доступная вторая."
+
+#: g10/helptext.c:226
+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 ""
+"Изменение предпочтений для всех User ID (или только выбранных)\n"
+"на текущий список предпочтений.  Отметка времени на всех затронутых\n"
+"самоподписях будет увеличена на одну секунду\n"
+
+#: g10/helptext.c:233
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr "Введите пароль; это секретная строка \n"
+
+#: g10/helptext.c:239
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr ""
+"Повторите последний пароль, чтобы убедиться в том, что он набран правильно."
+
+#: g10/helptext.c:243
+msgid "Give the name of the file to which the signature applies"
+msgstr "Введите имя файла, к которому относится данная подпись"
+
+#: g10/helptext.c:248
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Ответьте \"yes\", если Вы хотите перезаписать файл"
+
+#: g10/helptext.c:253
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"Введите новое имя файла. Если Вы нажмете только RETURN будет использован\n"
+"по умолчанию тот файл, который показан в квадратных скобках."
+
+#: g10/helptext.c:259
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"Вы можете указать причину отзыва ключа.  Основываясь на \n"
+"контексте Вы можете выбрать один из следующих вариантов:\n"
+"  \"Ключ был скомпрометирован\"\n"
+"      Выберите, если Вы полагаете, что посторонний человек\n"
+"      получил доступ к Вашему секретному ключу.\n"
+"  \"Ключ заменен другим\"\n"
+"      Выберите, если Вы заменили данный ключ на другой.\n"
+"  \"Ключ больше не используется\"\n"
+"      Выберите, если Вы отказались от использования данного ключа.\n"
+"  \"User ID больше не используется\"\n"
+"      Выберите, если Вы больше не используете данный User ID. Обычно\n"
+"      это используется, чтобы указать, что данный e-mail больше\n"
+"      не используется\n"
+
+#: g10/helptext.c:275
+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 ""
+"Если хотите, Вы можете ввести здесь текст с указанием\n"
+"причины создания сертификата отзыва.  Будьте кратки.\n"
+"Для завершения введите пустую строку.\n"
+
+#: g10/helptext.c:290
+msgid "No help available"
+msgstr "Нет доступной справки"
+
+#: g10/helptext.c:298
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Нет справки для `%s'"
+
+#: g10/keydb.c:189
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "ошибка создания таблицы ключей `%s': %s\n"
+
+#: g10/keydb.c:196
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "создана таблица ключей `%s'\n"
+
+#: g10/keydb.c:615
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "сбой перестройки кэша таблицы ключей: %s\n"
+
+#: g10/keyring.c:1236
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "ВНИМАНИЕ: Существуют 2 файла с конфиденциальной информацией.\n"
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s осталось без изменений\n"
+
+#: g10/keyring.c:1239
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s новых\n"
+
+#: g10/keyring.c:1240
+msgid "Please fix this possible security flaw\n"
+msgstr "Исправьте эту прореху безопасности\n"
+
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "проверка таблицы ключей `%s'\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu ключей проверено (%lu подписей)\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu ключей проверено (%lu подписей)\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: таблица ключей создана\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Выберите изображение для использования в качестве Вашего Фото ID.\n"
+"Изображение должно быть в формате JPEG. Помните, что оно будет храниться\n"
+"с Вашим открытым ключом и увеличит его размер, т.е. не следует брать очень\n"
+"большое изображение. Рекомендуемый размер около 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Введите имя JPEG файла для Фото ID: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Не могу открыть фото \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Вы действительно хотите использовать его? (y/N)"
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" не JPEG файл\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Данное фото правильное (y/N/q)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "не могу отобразить Фото ID!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "удаленный запуск программы не поддерживается\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "не могу создать каталог `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr "вызов внешних программ отключен из-за небезопасных прав доступа\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"на данной платформе требуется использование временных файлов\n"
+" при вызове внешних программ\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "не могу запустить %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "ошибка системы при вызове внешней программы: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "ненормалоьное завершение внешней программы\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "не могу запустить внешнюю программу\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "не могу прочитать ответ внешней программы: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "ВНИМАНИЕ: не могу удалить временный файл (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "никогда   "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "ключ %08lX: не имеет User ID\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Будет отозван:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Это отзывающий ключ с sensitive)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Создать сертификат отзыва данного ключа? (y/n)"
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "Для вывода использован ASCII формат.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Сертификат отзыва создан.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "ключи отзыва для `%s' не найдены\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "секретный ключ `%s' не найден: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "нет соотвествующего открытого ключа: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "открытый ключ не соотвествует секретному!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "неизвестный алгоритм защиты\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Сертификат отзыва создан.\n"
+"\n"
+"Поместите его в скрытое место;  если посторонний получит доступ\n"
+"к данному сертификату, он может использовать его, чтобы сделать\n"
+"Ваш ключ непригодным к использованию. Можно распечатьтать данный\n"
+"сертификат и спрятать подальше,  на случай если Ваш основной\n"
+"носитель будет повреждён, но будьте осторожны: система печати\n"
+"Вашей машины может сохранить данные и сделать их доступными для других!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Выберите причину отзыва:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Отмена"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Возможно Вы хотите выбрать здесь %d)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Причина отзыва: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(Пояснения отсутствуют)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Все правильно? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Список присвоенных значений доверия создан %s\n"
+"# (Используйте \"gpg --import-ownertrust\" для их восстановления)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "не могу открыть файл: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "строка слишком длинная\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "ошибка: пропущен столбец\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "ошибка: неверный отпечаток\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "ошибка: нет значения доверия (ownertrust)\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "ошибка поиска записи о доверии: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "ошибка чтения: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "ВНИМАНИЕ: хэш-функция `%s' не включена в стандарт OpenPGP.\n"
+#~ "Используйте на свой риск!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[files]|зашифровать файлы"
+
+#~ msgid "store only"
+#~ msgstr "только сохранить"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[files]|расшифровать файлы"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "подписать ключ без возможности отзыва"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "подписать ключ локально и без возможности отзыва"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "вывести список только последовательности пакетов"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "экспорт присвоенных значений доверия"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "импорт присвоенных значений доверия"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "фоновая проверка и обновление таблицы доверий"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "исправить повреждённую таблицу доверий"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "раскодировать из ASCII формата"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "закодировать в ASCII формат"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAME|использовать NAME, в качестве получателя по умолчанию"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "использовать ключ по умолчанию, как получателя по умолчанию"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "не использовать терминал для вывода"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "принудительное использование подписей v3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "откл. принудительнное использование подписей v3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "принудительное использование подписей v4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "откл. принудительное использование подписей v4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "всегда использовать MDC при зашифровании"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "никогда не использовать MDC при зашифровании"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "использовать gpg-agent"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "пакетный режим: ничего не спрашивать"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "отвечать Да на большинство вопросов"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "отвечать Нет на большинство вопросов"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "добавить таблицу ключей в список связок ключей"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "добавить таблицу секретных ключей в список"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "показывать какие таблицы ключей включают выводимый ключ"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NAME|установить секретный ключ по умолчанию"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|HOST|использовать сервер HOST для поиска ключей"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAME|использовать кодировку NAME"
+
+#~ msgid "read options from file"
+#~ msgstr "взять параметры из файла"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[file]|выводить строки состояния в file"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|KEYID|абсолютное доверие владельцу ключа KEYID"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|file|загрузить модуль расширения file"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "режим совместимости с RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "режим совместимости с OpenPGP"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr "режим совместимости с PGP 2.x"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|использовать метод N для обработки пароля"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NAME|использовать хэш-функцию NAME для паролей"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NAME|использовать алгоритм NAME для шифрования паролей"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NAME|использовать алгоритм шифрования NAME"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NAME|использовать хэш-функцию NAME"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|использовать метод сжатия номер N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "не сохранять идентификатор ключа в зашифрованном сообщении"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Показывать фото ID"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Не показывать фото ID"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Задать командную строку для показа фото ID"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "алгоритм сжатия `%s' в настоящей версии используется только для чтения\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "метод сжатия должен быть в диапазоне %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Нет уверенности, что данный ключ принадлежит его владельцу,\n"
+#~ "но он все равно будет использован\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "предпочтения %c%lu не действительны\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "ключ %08lX: не rfc2440 ключ - пропущен\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "ЗАМЕЧАНИЕ: Обнаружен главный ключ Elgamal - импорт может занять время\n"
+
+#~ msgid " (default)"
+#~ msgstr " (по умолчанию)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  создан: %s истекает: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Примечание: "
+
+#~ msgid "Policy: "
+#~ msgstr "URL Правил: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "запрос ключа %08lX с %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "не могу получить ключ с сервера ключей: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "ошибка отправки на `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "успешно отправлено на `%s' (статус=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "сбой отправки на `%s': статус=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "Данный сервер ключей не поддерживает --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "поиск \"%s\" на HKP сервере %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "не могу найти сервер ключей: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "ключ %08lX: это созданный PGP - ElGamal ключ, который НЕ безопасен для "
+#~ "подписей!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "ключ %08lX был создан через %lu секунд в будущем (сдвиг времени или "
+#~ "проблема с часами)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "ключ %08lX был создан через %lu секунд в будущем (сдвиг времени или "
+#~ "проблема с часами)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "ключ %08lX помечен как абсолютно доверяемый\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "подпись Elgamal ключом %08lX на %08lX проигнорирована\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "Подпись от %08lX на Elgamal ключе %08lX проигнорирована\n"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Выберите используемый алгоритм.\n"
+#~ "DSA (aka DSS) - алгоритм цифровой подписи, который может использоваться\n"
+#~ "  только для подписей.  Это рекомендуемый алгоритм потому, что проверка\n"
+#~ "  DSA подписей намного быстрее, чем ElGamal.\n"
+#~ "ElGamal - алгоритм, который может использоваться для шифрования.\n"
+#~ "RSA - широко распространённый алгоритм, который может использоваться\n"
+#~ "  и для подписи и для шифрования.\n"
+#~ "Первый (главный) ключ всегда должен быть ключом пригодным для подписи;\n"
+#~ "по этой причине ключи ElGamal и RSA предназначенные только для "
+#~ "шифрования\n"
+#~ "не указаны в данном меню."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Хотя эти ключи и описаны в RFC2440, использовать их не рекомендуются\n"
+#~ "потому, что они поддерживаются не всеми программами и подписи созданные\n"
+#~ "с ними длинные и очень медленно проверяются."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu ключей пока проверены (%lu подписей)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "ключ неполный\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "ключ %08lX неполный\n"
diff --git a/po/sk.po b/po/sk.po
new file mode 100644
index 000000000..0927cdd6d
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,5714 @@
+# GnuPG Slovak translation
+# Copyright (C) 1998 - 2004 Free Software Foundation, Inc.
+# Michal Majer <[email protected]>, 2002 - 2004
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.2.5\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-07-20 15:52+0200\n"
+"Last-Translator: Michal Majer <[email protected]>\n"
+"Language-Team: Slovak <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: util/secmem.c:90
+msgid "WARNING: using insecure memory!\n"
+msgstr "VAROVANIE: Pou��van� pam� nie je bezpe�n�!\n"
+
+#: util/secmem.c:91
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr "Viac inform�ci� n�jdete na adrese http://www.gnupg.org/faq.html\n"
+
+#: util/secmem.c:340
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
+
+#: util/secmem.c:341
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
+
+#: util/miscutil.c:307 util/miscutil.c:344
+msgid "yes"
+msgstr "ano"
+
+#: util/miscutil.c:308 util/miscutil.c:349
+msgid "yY"
+msgstr "aAyY"
+
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "nie"
+
+#: util/miscutil.c:311 util/miscutil.c:350
+msgid "nN"
+msgstr "nN"
+
+#: util/miscutil.c:348 g10/keyedit.c:1138
+msgid "quit"
+msgstr "ukon�i�"
+
+#: util/miscutil.c:351
+msgid "qQ"
+msgstr "uUqQ"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "v�eobecn� chyba"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "nezn�my typ paketu"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "nezn�ma verzia"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "nezn�my algoritmus verejn�ho k���a"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "nezn�my hashovac� algoritmus"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "neplatn� verejn� k���"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "neplatn� tajn� k���"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "neplatn� podpis"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "chyba kontroln�ho s��tu"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "nespr�vne heslo"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "verejn� k��� nen�jden�"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "nezn�my �ifrovac� algoritmus"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "nem��em otvori� s�bor k���ov"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "neplatn� paket"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "neplatn� sp�sob reprezent�cie v ASCII"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "u��vate� s t�mto id neexistuje"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "tajn� k��� nie je dostupn�"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "bol pou�it� nespr�vny tajn� k���"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "nepodporovan�"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "nespr�vny k���"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "chyba pri ��tan� s�boru"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "chyba pri z�pise s�boru"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "nezn�my kompresn� algoritmus"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "chyba pri otv�ran� s�boru"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "chyba pri vytv�ran� s�boru"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "nespr�vne heslo"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "algoritmus verejn�ho k���a nie je implementovan�"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "�ifrovac� algoritmus nie je implementovan�"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "nezn�ma trieda podpisu"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "chyba v datab�ze d�very"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "nespr�vne MPI"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "obmedzenie zdrojov"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "neplatn� s�bor k���ov"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "nespr�vny certifik�t"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "nespr�vny form�t id u��vate�a"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "chyba pri zatv�ran� s�boru"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "chyba pri premenov�van� s�boru"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "chyba pri mazan� s�boru"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "neo�ak�van� d�ta"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "konflikt �asov�ho raz�tka"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "nepou�ite�n� algoritmus s verejn�m k���om"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "s�bor existuje"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "slab� k���"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "neplatn� argument"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "nespr�vne URI"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "toto URI nie je podporovan�"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "chyba siete"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "neza�ifrovan�"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "nespracovan�"
+
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "nepou�ite�n� verejn� k���"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "nepou�ite�n� tajn� k���"
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr "chyba servera k���ov"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... toto je chyba v programe (%s:%d:%s)\n"
+
+#: util/logger.c:285
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "n�jden� chyba v programe ... (%s:%d)\n"
+
+#: cipher/random.c:163
+msgid "no entropy gathering module detected\n"
+msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
+
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "nem��em otvori� `%s': %s\n"
+
+#: cipher/random.c:391
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "nem��em pou�i� pr�kaz stat na `%s': %s\n"
+
+#: cipher/random.c:396
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
+
+#: cipher/random.c:401
+msgid "note: random_seed file is empty\n"
+msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
+
+#: cipher/random.c:407
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
+
+#: cipher/random.c:415
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "nem��em ��ta� `%s': %s\n"
+
+#: cipher/random.c:453
+msgid "note: random_seed file not updated\n"
+msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
+
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "nem��em vytvori� `%s': %s\n"
+
+#: cipher/random.c:480
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "nem��em zapisova� do `%s': %s\n"
+
+#: cipher/random.c:483
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "nem��em zavrie� `%s': %s\n"
+
+#: cipher/random.c:728
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
+
+#: cipher/random.c:729
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"Gener�tor n�hodn�ch ��sel je len atrapa, aby program mohol be�a�,\n"
+"v �iadnom pr�pade nie je kryptograficky bezpe�n�!\n"
+"\n"
+"NEPOU��VAJTE �IADNE D�TA VYTVOREN� T�MTO PROGRAMOM!!\n"
+"\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Nedostatok n�hodn�ch bajtov. Pros�m, pracujte s opera�n�m syst�mom, aby\n"
+"ste mu umo�nili z�ska� viac entropie (je potrebn�ch %d bajtov).\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "hashovac� algoritmus `%s' je len na ��tanie v tejto verzii\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Pros�m �akajte, z�skava sa entropia. Robte zatia� nejak� in� pr�cu\n"
+"aby ste sa nenudili a zv��ite t�m kvalitu entropie.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
+
+#: g10/g10.c:354
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Pr�kazy:\n"
+" "
+
+#: g10/g10.c:356
+msgid "|[file]|make a signature"
+msgstr "|[s�bor]|vytvori� podpis"
+
+#: g10/g10.c:357
+msgid "|[file]|make a clear text signature"
+msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
+
+#: g10/g10.c:358
+msgid "make a detached signature"
+msgstr "vytvori� podpis oddelen� od dokumentu"
+
+#: g10/g10.c:359
+msgid "encrypt data"
+msgstr "�ifrova� d�ta"
+
+#: g10/g10.c:361
+msgid "encryption only with symmetric cipher"
+msgstr "�ifrovanie len so symetrickou �ifrou"
+
+#: g10/g10.c:363
+msgid "decrypt data (default)"
+msgstr "de�ifrova� d�ta (implicitne)"
+
+#: g10/g10.c:365
+msgid "verify a signature"
+msgstr "verifikova� podpis"
+
+#: g10/g10.c:367
+msgid "list keys"
+msgstr "vyp�sa� zoznam k���ov"
+
+#: g10/g10.c:369
+msgid "list keys and signatures"
+msgstr "vyp�sa� zoznam k���ov a podpisov"
+
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "skontrolova� podpisy k���ov"
+
+#: g10/g10.c:371
+msgid "list keys and fingerprints"
+msgstr "vyp�sa� zoznam k���ov a fingerprintov"
+
+#: g10/g10.c:372
+msgid "list secret keys"
+msgstr "vyp�sa� zoznam tajn�ch k���ov"
+
+#: g10/g10.c:373
+msgid "generate a new key pair"
+msgstr "vytvori� nov� p�r k���ov"
+
+#: g10/g10.c:374
+msgid "remove keys from the public keyring"
+msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
+
+#: g10/g10.c:376
+msgid "remove keys from the secret keyring"
+msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
+
+#: g10/g10.c:377
+msgid "sign a key"
+msgstr "podp�sa� k���"
+
+#: g10/g10.c:378
+msgid "sign a key locally"
+msgstr "podp�sa� k��� lok�lne"
+
+#: g10/g10.c:381
+msgid "sign or edit a key"
+msgstr "podp�sa� alebo modifikova� k���"
+
+#: g10/g10.c:382
+msgid "generate a revocation certificate"
+msgstr "vytvori� revoka�n� certifik�t"
+
+#: g10/g10.c:384
+msgid "export keys"
+msgstr "exportova� k���e"
+
+#: g10/g10.c:385
+msgid "export keys to a key server"
+msgstr "exportova� k���e na server k���ov"
+
+#: g10/g10.c:386
+msgid "import keys from a key server"
+msgstr "importova� k���e zo servera k���ov"
+
+#: g10/g10.c:388
+msgid "search for keys on a key server"
+msgstr "vyh�ada� k���e na serveri k���ov"
+
+#: g10/g10.c:390
+msgid "update all keys from a keyserver"
+msgstr "aktualizova� v�etky k���e zo servera k���ov"
+
+#: g10/g10.c:393
+msgid "import/merge keys"
+msgstr "importova�/zl��i� k���e"
+
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
+
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
+
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
+
+#: g10/g10.c:406
+msgid "update the trust database"
+msgstr "aktualizova� datab�zu d�very"
+
+#: g10/g10.c:413
+msgid "|algo [files]|print message digests"
+msgstr "|algo [s�bory]|vyp�� hash"
+
+#: g10/g10.c:417 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Mo�nosti:\n"
+" "
+
+#: g10/g10.c:419
+msgid "create ascii armored output"
+msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
+
+#: g10/g10.c:421
+msgid "|NAME|encrypt for NAME"
+msgstr "|MENO|�ifrova� pre MENO"
+
+#: g10/g10.c:432
+msgid "use this user-id to sign or decrypt"
+msgstr ""
+"pou�i� toto id u��vate�a na podp�sanie\n"
+" alebo de�ifrovanie"
+
+#: g10/g10.c:433
+msgid "|N|set compress level N (0 disables)"
+msgstr ""
+"|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
+" komprim�cia)"
+
+#: g10/g10.c:438
+msgid "use canonical text mode"
+msgstr "pou�i� k�nonick� textov� m�d"
+
+#: g10/g10.c:448
+msgid "use as output file"
+msgstr "pou�i� ako v�stupn� s�bor"
+
+#: g10/g10.c:450 g10/gpgv.c:66
+msgid "verbose"
+msgstr "s dodato�n�mi inform�ciami"
+
+#: g10/g10.c:461
+msgid "do not make any changes"
+msgstr "nevykona� �iadne zmeny"
+
+#: g10/g10.c:462
+msgid "prompt before overwriting"
+msgstr "vy�iada� potvrdenie pred prep�san�m"
+
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
+
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:535
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
+"mo�nost�)\n"
+
+#: g10/g10.c:538
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"Pr�klady:\n"
+"\n"
+" -se -r Bob [s�bor]        podp�sa� a za�ifrova� pre u��vate�a Bob\n"
+" --clearsign [s�bor]       vytvori� podpis �itate�n�ho dokumentu\n"
+" --detach-sign [s�bor]     vytvori� podpis oddelen� od dokumentu\n"
+" --list-keys [men�]        vyp�sa� k���e\n"
+" --fingerprint [men�]      vyp�sa� fingerprinty\n"
+
+#: g10/g10.c:713 g10/gpgv.c:91
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr ""
+"Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
+"Pripomienky k prekladu <[email protected]>.\n"
+
+#: g10/g10.c:730
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: g10/g10.c:733
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Syntax: gpg [mo�nosti] [s�bory]\n"
+"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
+"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
+
+#: g10/g10.c:744
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Podporovan� algoritmy:\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "Verejn� k���e: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "�ifry: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Kompresia: "
+
+#: g10/g10.c:848
+msgid "usage: gpg [options] "
+msgstr "pou�itie: gpg [mo�nosti] "
+
+#: g10/g10.c:951
+msgid "conflicting commands\n"
+msgstr "konfliktn� pr�kazy\n"
+
+#: g10/g10.c:969
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr ""
+"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr ""
+"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr ""
+"VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
+
+#: g10/g10.c:1601
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
+
+#: g10/g10.c:1637
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
+
+#: g10/g10.c:1641
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "s�bor s mo�nos�ami `%s': %s\n"
+
+#: g10/g10.c:1648
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "��tam mo�nosti z `%s'\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
+
+#: g10/g10.c:1887
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr ""
+"�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
+"bezpe�ne\n"
+
+#: g10/g10.c:2099
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s nie je platn� znakov� sada\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
+
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: neplatn� parameter pre export\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "neplatn� parameter pre export\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: neplatn� parameter pre import\n"
+
+#: g10/g10.c:2137
+msgid "invalid import options\n"
+msgstr "neplatn� parameter pre import\n"
+
+#: g10/g10.c:2144
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: neplatn� parameter pre export\n"
+
+#: g10/g10.c:2147
+msgid "invalid export options\n"
+msgstr "neplatn� parameter pre export\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: neplatn� parameter pre import\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "neplatn� parameter pre import\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: neplatn� parameter pre export\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "neplatn� parameter pre export\n"
+
+#: g10/g10.c:2208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "nemo�no nastavi� exec-path na %s\n"
+
+#: g10/g10.c:2398
+msgid "WARNING: program may create a core file!\n"
+msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
+
+#: g10/g10.c:2402
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "VAROVANIE: %s prep��e %s\n"
+
+#: g10/g10.c:2411
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "Nie je dovolen� pou��va� %s s %s!\n"
+
+#: g10/g10.c:2414
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s ned�va s %s zmysel!\n"
+
+#: g10/g10.c:2435
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr ""
+"v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
+"ako text\n"
+
+#: g10/g10.c:2441
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
+
+#: g10/g10.c:2447
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
+
+#: g10/g10.c:2460
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
+
+#: g10/g10.c:2528 g10/g10.c:2552
+msgid "selected cipher algorithm is invalid\n"
+msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
+
+#: g10/g10.c:2534 g10/g10.c:2558
+msgid "selected digest algorithm is invalid\n"
+msgstr "vybran� hashovac� algoritmus je neplatn�\n"
+
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
+
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "vybran� hashovac� algoritmus je neplatn�\n"
+
+#: g10/g10.c:2561
+msgid "completes-needed must be greater than 0\n"
+msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
+
+#: g10/g10.c:2563
+msgid "marginals-needed must be greater than 1\n"
+msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
+
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
+
+#: g10/g10.c:2572
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
+
+#: g10/g10.c:2576
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
+
+#: g10/g10.c:2583
+msgid "invalid default preferences\n"
+msgstr "neplatn� defaultn� predvo�by\n"
+
+#: g10/g10.c:2592
+msgid "invalid personal cipher preferences\n"
+msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
+
+#: g10/g10.c:2596
+msgid "invalid personal digest preferences\n"
+msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
+
+#: g10/g10.c:2600
+msgid "invalid personal compress preferences\n"
+msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s e�te nepracuje s %s\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
+
+#: g10/g10.c:2778
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "nem��em inicializova� datab�zu d�very: %s\n"
+
+#: g10/g10.c:2789
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+"VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
+
+#: g10/g10.c:2800
+msgid "--store [filename]"
+msgstr "--store [meno s�boru]"
+
+#: g10/g10.c:2807
+msgid "--symmetric [filename]"
+msgstr "--symmetric [meno s�boru]"
+
+#: g10/g10.c:2819
+msgid "--encrypt [filename]"
+msgstr "--encrypt [meno s�boru]"
+
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [meno s�boru]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr ""
+"pou�itie %s nie je v m�de %s dovolen�\n"
+"\n"
+
+#: g10/g10.c:2855
+msgid "--sign [filename]"
+msgstr "--sign [meno s�boru]"
+
+#: g10/g10.c:2868
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [meno s�boru]"
+
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [meno s�boru]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr ""
+"pou�itie %s nie je v m�de %s dovolen�\n"
+"\n"
+
+#: g10/g10.c:2908
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [meno s�boru]"
+
+#: g10/g10.c:2917
+msgid "--clearsign [filename]"
+msgstr "--clearsign [meno s�boru]"
+
+#: g10/g10.c:2942
+msgid "--decrypt [filename]"
+msgstr "--decrypt [meno s�boru]"
+
+#: g10/g10.c:2950
+msgid "--sign-key user-id"
+msgstr "--sign-key id u��vate�a"
+
+#: g10/g10.c:2954
+msgid "--lsign-key user-id"
+msgstr "--lsign-key id u��vate�a"
+
+#: g10/g10.c:2958
+msgid "--nrsign-key user-id"
+msgstr "--nrsign-key id u��vate�a"
+
+#: g10/g10.c:2962
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key id u��vate�a"
+
+#: g10/g10.c:2986
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key id u��vate�a [pr�kazy]"
+
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "nemo�no otvori� %s: %s\n"
+
+#: g10/g10.c:3057
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
+
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "nepodarilo posla� k��� na server: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "nepodaril sa export k���a: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "nepodarilo sa n�js� server: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "aktualiz�cia servera zlyhala: %s\n"
+
+#: g10/g10.c:3160
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
+
+#: g10/g10.c:3168
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
+
+#: g10/g10.c:3255
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "neplatn� hashovac� algoritmus `%s'\n"
+
+#: g10/g10.c:3378
+msgid "[filename]"
+msgstr "[meno s�boru]"
+
+#: g10/g10.c:3382
+msgid "Go ahead and type your message ...\n"
+msgstr "Za�nite p�sa� svoju spr�vu ...\n"
+
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "nemo�no otvori� `%s'\n"
+
+#: g10/g10.c:3659
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
+"kon�i� s '='\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "hodnota mus� obsahova� znak '@'\n"
+
+#: g10/g10.c:3678
+msgid "a notation value must not use any control characters\n"
+msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
+
+#: g10/g10.c:3712
+msgid "the given certification policy URL is invalid\n"
+msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
+
+#: g10/g10.c:3714
+msgid "the given signature policy URL is invalid\n"
+msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "by� o trochu tich��"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "Zmaza� tento k��� zo s�boru k���ov? "
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "konflikt �asov�ho raz�tka"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Syntax: gpg [nastavenia] [s�bory]\n"
+"Skontroluje podpisy oproti zn�mym d�veryhodn�m k���om\n"
+
+#: g10/armor.c:317
+#, c-format
+msgid "armor: %s\n"
+msgstr "ASCII k�dovanie: %s\n"
+
+#: g10/armor.c:346
+msgid "invalid armor header: "
+msgstr "neplatn� hlavi�ka ASCII k�dovania: "
+
+#: g10/armor.c:353
+msgid "armor header: "
+msgstr "ASCII hlavi�ka: "
+
+#: g10/armor.c:364
+msgid "invalid clearsig header\n"
+msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
+
+#: g10/armor.c:416
+msgid "nested clear text signatures\n"
+msgstr "vnoren� podpisy v �itate�nom form�tu\n"
+
+#: g10/armor.c:553
+msgid "invalid dash escaped line: "
+msgstr "nespr�vne ozna�enie riadku m�nusmi: "
+
+#: g10/armor.c:565
+msgid "unexpected armor:"
+msgstr "neo�ak�van� k�dovanie ASCII:"
+
+#: g10/armor.c:695 g10/armor.c:1276
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
+
+#: g10/armor.c:738
+msgid "premature eof (no CRC)\n"
+msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in CRC)\n"
+msgstr "pred�asn� koniec s�boru (v CRC)\n"
+
+#: g10/armor.c:776
+msgid "malformed CRC\n"
+msgstr "nespr�vny form�t CRC\n"
+
+#: g10/armor.c:780 g10/armor.c:1313
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "Chyba CRC; %06lx - %06lx\n"
+
+#: g10/armor.c:800
+msgid "premature eof (in Trailer)\n"
+msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
+
+#: g10/armor.c:804
+msgid "error in trailer line\n"
+msgstr "chyba v p�ti�ke\n"
+
+#: g10/armor.c:1091
+msgid "no valid OpenPGP data found.\n"
+msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
+
+#: g10/armor.c:1096
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
+
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
+"pou�it� nespr�vny MTA\n"
+
+#: g10/pkclist.c:61 g10/revoke.c:576
+msgid "No reason specified"
+msgstr "D�vod nebol �pecifikovan�"
+
+#: g10/pkclist.c:63 g10/revoke.c:578
+msgid "Key is superseded"
+msgstr "K��� je nahraden�"
+
+#: g10/pkclist.c:65 g10/revoke.c:577
+msgid "Key has been compromised"
+msgstr "K��� bol skompromitovan�"
+
+#: g10/pkclist.c:67 g10/revoke.c:579
+msgid "Key is no longer used"
+msgstr "K��� sa u� nepou��va"
+
+#: g10/pkclist.c:69 g10/revoke.c:580
+msgid "User ID is no longer valid"
+msgstr "Identifik�tor u��vate�a u� neplat�"
+
+#: g10/pkclist.c:73
+msgid "reason for revocation: "
+msgstr "d�vod na revok�ciu: "
+
+#: g10/pkclist.c:90
+msgid "revocation comment: "
+msgstr "revoka�n� pozn�mka: "
+
+#: g10/pkclist.c:195
+msgid "iImMqQsS"
+msgstr "iImMuUsS"
+
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
+msgstr ""
+"Nie je priraden� �iadna hodnota d�very k:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                alias \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+"Pros�m rozhodnite, nako�ko d�verujete tomuto u��vate�ovi, �e spr�vne\n"
+"verifikuje k���e in�ch u��vate�ov (prezret�m cestovn�ch pasov,\n"
+"kontrolou fingerprintov z r�znych zdrojov...)?\n"
+"\n"
+
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = Neviem\n"
+
+#: g10/pkclist.c:252
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = Ned�verujem\n"
+
+#: g10/pkclist.c:254
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = D�verujem �iasto�ne\n"
+
+#: g10/pkclist.c:256
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = D�verujem �plne\n"
+
+#: g10/pkclist.c:258
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = D�verujem absol�tne\n"
+
+#: g10/pkclist.c:261
+msgid " i = please show me more information\n"
+msgstr " i = pros�m o viac inform�c�i\n"
+
+#: g10/pkclist.c:264
+msgid " m = back to the main menu\n"
+msgstr " m = sp� do hlavn�ho menu\n"
+
+#: g10/pkclist.c:267
+msgid " s = skip this key\n"
+msgstr " s = presko�i� tento k���\n"
+
+#: g10/pkclist.c:268
+msgid " q = quit\n"
+msgstr " u = ukon�i�\n"
+
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
+msgid "Your decision? "
+msgstr "Va�e rozhodnutie? "
+
+#: g10/pkclist.c:299
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "Skuto�ne chcete nastavi� pre tento k��� absol�tnu d�veru? "
+
+#: g10/pkclist.c:313
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certifik�ty ved�ce k fin�lnemu d�veryhodn�mu k���u:\n"
+
+#: g10/pkclist.c:387
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "k��� %08lX: k��� bol revokovan�\n"
+
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
+msgid "Use this key anyway? "
+msgstr "Pou�i� napriek tomu tento k���? "
+
+#: g10/pkclist.c:399
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "k��� %08lX: podk��� bol revokovan�!\n"
+
+#: g10/pkclist.c:420
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: skon�ila platnos� k���a\n"
+
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: NEd�verujeme tomuto k���u!\n"
+
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
+
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "Tento k��� pravdepodobne patr� jeho majite�ovi\n"
+
+#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "Tento k��� patr� n�m (m�me zodpovedaj�ci tajn� k���)\n"
+
+#: g10/pkclist.c:500
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+"NIE JE ist�, �e tento k��� patr� osobe, ktor� sa vyd�va za jeho\n"
+"vlastn�ka. Pokia� *skuto�ne* viete, �o rob�te, m��ete na ot�zku\n"
+"odpoveda� �no\n"
+"\n"
+
+#: g10/pkclist.c:514 g10/pkclist.c:544
+msgid "WARNING: Using untrusted key!\n"
+msgstr "VAROVANIE: Je pou�it� ned�veryhodn� k���!\n"
+
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "VAROVANIE: k��� m��e by� revokovan� (revoka�n� k��� neexistuje)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
+
+#: g10/pkclist.c:563
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
+
+#: g10/pkclist.c:564
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         To m��e znamena�, �e podpis je falo�n�.\n"
+
+#: g10/pkclist.c:570
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
+
+#: g10/pkclist.c:575
+msgid "Note: This key has been disabled.\n"
+msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
+
+#: g10/pkclist.c:580
+msgid "Note: This key has expired!\n"
+msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
+
+#: g10/pkclist.c:591
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+"         Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
+
+#: g10/pkclist.c:601
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
+
+#: g10/pkclist.c:602
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         Tento podpis je pravdepodobne FALO�N�.\n"
+
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
+"podpismi!\n"
+
+#: g10/pkclist.c:612
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr ""
+"pou�itie %s nie je v m�de %s dovolen�\n"
+"\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: presko�en�: %s\n"
+
+#: g10/pkclist.c:787 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: presko�en�: verejn� k��� je u� obsiahnut� v datab�ze\n"
+
+#: g10/pkclist.c:829
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr ""
+"Ne�pecifikovali ste identifik�tor u��vate�a (user ID). M��ete pou�i� \"-r\"\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+"\n"
+"Nap��te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
+
+#: g10/pkclist.c:887
+msgid "No such user ID.\n"
+msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
+
+#: g10/pkclist.c:892 g10/pkclist.c:954
+msgid "skipped: public key already set as default recipient\n"
+msgstr "presko�en�: verejn� k��� je u� nastaven� pod�a implicitn�ho adres�ta\n"
+
+#: g10/pkclist.c:910
+msgid "Public key is disabled.\n"
+msgstr "Verejn� k��� je neplatn� (disabled).\n"
+
+#: g10/pkclist.c:917
+msgid "skipped: public key already set\n"
+msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
+
+#: g10/pkclist.c:946
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "nezn�my implicitn� adres�t `%s'\n"
+
+#: g10/pkclist.c:991
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
+
+#: g10/pkclist.c:1046
+msgid "no valid addressees\n"
+msgstr "�iadne platn� adresy\n"
+
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "duplicita predvo�by %c%lu\n"
+
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "pr�li� ve�a `%c' predvolieb\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "pr�li� ve�a `%c' predvolieb\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "pr�li� ve�a `%c' predvolieb\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "neplatn� znak v re�azci s predvo�bami\n"
+
+#: g10/keygen.c:738
+msgid "writing direct signature\n"
+msgstr "zapisujem podpis k���a n�m sam�m (direct signature)\n"
+
+#: g10/keygen.c:777
+msgid "writing self signature\n"
+msgstr "zapisujem podpis k���a sebou sam�m\n"
+
+#: g10/keygen.c:823
+msgid "writing key binding signature\n"
+msgstr "zapisujem \"key-binding\" podpis\n"
+
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
+
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
+
+#: g10/keygen.c:1165
+msgid "Please select what kind of key you want:\n"
+msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
+
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
+
+#: g10/keygen.c:1168
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (len na podpis)\n"
+
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
+
+#: g10/keygen.c:1171
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (len na podpis)\n"
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (len na �ifrovanie)\n"
+
+#: g10/keygen.c:1175
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
+
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+msgid "Your selection? "
+msgstr "V� v�ber? "
+
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+msgid "Invalid selection.\n"
+msgstr "Neplatn� v�ber.\n"
+
+#: g10/keygen.c:1225
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Chyst�m sa vytvori� nov� p�r k���ov %s.\n"
+"                       minim�lna ve�kos� k���a je  768 bitov\n"
+"                      implicitn� ve�kos� k���a je 1024 bitov\n"
+"            najvy��ia navrhovan� ve�kos� k���a je 2048 bitov\n"
+
+#: g10/keygen.c:1234
+msgid "What keysize do you want? (1024) "
+msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+
+#: g10/keygen.c:1239
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "k��� DSA mus� ma� ve�kos� od 512 do 1024 bitov.\n"
+
+#: g10/keygen.c:1241
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr ""
+"ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� pre RSA je 1024 "
+"bitov.\n"
+
+#: g10/keygen.c:1244
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr ""
+"ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� je 768 bitov.\n"
+
+#: g10/keygen.c:1255
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "ve�kos� k���a je pr�li� ve�k�; maxim�lna povolen� hodnota je %d.\n"
+
+#: g10/keygen.c:1260
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"Ve�kosti k���ov v��ie ako 2048 bitov se neodpor��aj�, preto�e\n"
+"v�po�ty potom trvaj� VE�MI dlho!\n"
+
+#: g10/keygen.c:1263
+msgid "Are you sure that you want this keysize? "
+msgstr "Skuto�ne chcete vytvori� k��� tejto d�ky? "
+
+#: g10/keygen.c:1264
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr ""
+"Dobre, ale nezab�dajte, �e inform�cie m��u by� vyzraden� z po��ta�a aj "
+"elektromagnetick�m vy�arovan�m monitora alebo kl�vesnice!\n"
+
+#: g10/keygen.c:1273
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
+
+#: g10/keygen.c:1276 g10/keygen.c:1280
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "zaokr�hlen� na %u bitov\n"
+
+#: g10/keygen.c:1331
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+"Pros�m ur�te, ako dlho by mal k��� platit.\n"
+"         0 = doba platnosti k���a nie je obmedzen�\n"
+"      <n>  = doba platnosti k���a skon�� za n dn�\n"
+"      <n>w = doba platnosti k���a skon�� za n t��d�ov\n"
+"      <n>m = doba platnosti k���a skon�� za n mesiacov\n"
+"      <n>y = doba platnosti k���a skon�� za n rokov\n"
+
+#: g10/keygen.c:1340
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"Pros�m ur�te, ako dlho by mal podpis platit.\n"
+"         0 = doba platnosti podpisu nie je onmedzen�\n"
+"      <n>  = doba platnosti podpisu skon�� za n dn�\n"
+"      <n>w = doba platnosti podpisu skon�� za n t��d�ov\n"
+"      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
+"      <n>y = doba platnosti podpisu skon�� za n rokov\n"
+
+#: g10/keygen.c:1362
+msgid "Key is valid for? (0) "
+msgstr "K��� je platn� na? (0) "
+
+#: g10/keygen.c:1364
+msgid "Signature is valid for? (0) "
+msgstr "Podpis je platn� na? (0) "
+
+#: g10/keygen.c:1369
+msgid "invalid value\n"
+msgstr "neplatn� hodnota\n"
+
+#: g10/keygen.c:1374
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr "platnos� %s neskon��\n"
+
+#: g10/keygen.c:1381
+#, c-format
+msgid "%s expires at %s\n"
+msgstr "platnos� %s skon�� %s\n"
+
+#: g10/keygen.c:1387
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"V� syst�m nevie zobrazi� d�tumy po roku 2038.\n"
+"V ka�dom pr�pade bud� d�tumy korektne spracov�van� do roku 2106.\n"
+
+#: g10/keygen.c:1392
+msgid "Is this correct (y/n)? "
+msgstr "Je to spr�vne (a/n)? "
+
+#: g10/keygen.c:1435
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"Aby bolo mo�n� rozpozna� V� k���, mus�te pozna� identifik�tor u��vate�a;\n"
+"program ho zlo�� z V�ho mena a priezviska, koment�ra a e-mailu v tomto "
+"tvare:\n"
+"    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
+"\n"
+
+#: g10/keygen.c:1447
+msgid "Real name: "
+msgstr "Meno a priezvisko: "
+
+#: g10/keygen.c:1455
+msgid "Invalid character in name\n"
+msgstr "Neplatn� znak ve mene\n"
+
+#: g10/keygen.c:1457
+msgid "Name may not start with a digit\n"
+msgstr "Meno nem��e za��na� ��slicou\n"
+
+#: g10/keygen.c:1459
+msgid "Name must be at least 5 characters long\n"
+msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
+
+#: g10/keygen.c:1467
+msgid "Email address: "
+msgstr "E-mailov� adresa: "
+
+#: g10/keygen.c:1478
+msgid "Not a valid email address\n"
+msgstr "Neplatn� e-mailov� adresa\n"
+
+#: g10/keygen.c:1486
+msgid "Comment: "
+msgstr "Koment�r: "
+
+#: g10/keygen.c:1492
+msgid "Invalid character in comment\n"
+msgstr "Neplatn� znak v koment�ri\n"
+
+#: g10/keygen.c:1515
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "Pou��vate znakov� sadu `%s'.\n"
+
+#: g10/keygen.c:1521
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"Zvolili ste tento identifik�tor u��vate�a:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:1526
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
+
+#: g10/keygen.c:1531
+msgid "NnCcEeOoQq"
+msgstr "mMkKeEPpUu"
+
+#: g10/keygen.c:1541
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
+
+#: g10/keygen.c:1542
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
+
+#: g10/keygen.c:1561
+msgid "Please correct the error first\n"
+msgstr "Najsk�r, pros�m, opravte chybu\n"
+
+#: g10/keygen.c:1600
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
+"\n"
+
+#: g10/keygen.c:1609 g10/keyedit.c:1021
+msgid "passphrase not correctly repeated; try again"
+msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
+
+#: g10/keygen.c:1610
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:1616
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway.  You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"Nechcete heslo - to *nie je* dobr� n�pad!\n"
+"Dobre, budem pokra�ova� bez hesla. Kedyko�vek m��ete heslo zmeni� pou�it�m\n"
+"tohto programu s parametrom \"--edit-key\".\n"
+"\n"
+
+#: g10/keygen.c:1638
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Je potrebn� vytvori� ve�a n�hodn�ch bajtov. Po�as vytv�rania m��ete\n"
+"vykon�va� in� pr�cu na po��ta�i (p�sa� na kl�vesnici, pohybova� my�ou,\n"
+"pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
+"entropie.\n"
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "nemo�no previes� v d�vkovom m�de\n"
+
+#: g10/keygen.c:2267
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
+
+#: g10/keygen.c:2335
+msgid "Key generation canceled.\n"
+msgstr "Vytv�ranie k���a bolo zru�en�.\n"
+
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "zapisujem verejn� k��� do `%s'\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#: g10/keygen.c:2565
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
+
+#: g10/keygen.c:2571
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
+
+#: g10/keygen.c:2589
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
+
+#: g10/keygen.c:2596
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
+
+#: g10/keygen.c:2619
+msgid "public and secret key created and signed.\n"
+msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
+
+#: g10/keygen.c:2630
+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 ""
+"Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
+"sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
+
+#: g10/keygen.c:2642 g10/keygen.c:2755
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+
+#: g10/keygen.c:2691 g10/sign.c:290
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
+"je probl�m so syst�mov�m �asom)\n"
+
+#: g10/keygen.c:2693 g10/sign.c:292
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
+"je probl�m so syst�mov�m �asom)\n"
+
+#: g10/keygen.c:2702
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
+
+#: g10/keygen.c:2730
+msgid "Really create? "
+msgstr "Skuto�ne vytvori�? "
+
+#: g10/decrypt.c:98 g10/encode.c:845
+msgid "--output doesn't work for this command\n"
+msgstr "--output pre tento pr�kaz nefunguje\n"
+
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: nem��em otvori�: %s\n"
+
+#: g10/encode.c:203 g10/sign.c:1144
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
+#: g10/encode.c:208
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
+
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "pou�it� �ifra %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "`%s' je u� skomprimovan�\n"
+
+#: g10/encode.c:301 g10/encode.c:590
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: VAROVANIE: s�bor je pr�zdny\n"
+
+#: g10/encode.c:465
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr ""
+"v m�de --pgp2 m��ete �ifrova� len RSA k���om s d�kou 2048 bitov a menej\n"
+
+#: g10/encode.c:480
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "��tam z `%s'\n"
+
+#: g10/encode.c:516
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr "algoritmus IDEA nemo�no pou�i� na v�etky k���e, pre ktor� �ifrujete.\n"
+
+#: g10/encode.c:526 g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"vy�iadan� kompresn� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+
+#: g10/encode.c:818
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s za�ifrovan� pre: %s\n"
+
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "k��� `%s' nebol n�jden�: %s\n"
+
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "chyba pri ��tan� bloku k���a: %s\n"
+
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
+
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
+
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
+
+#: g10/export.c:385
+msgid "WARNING: nothing exported\n"
+msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
+
+#: g10/getkey.c:186 g10/getkey.c:2693
+msgid "[User id not found]"
+msgstr "[User id not found]"
+
+# c-format
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr ""
+"Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
+
+#: g10/import.c:241
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "blok typu %d bol presko�en�\n"
+
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu k���e boli doteraz spracovan�\n"
+
+#: g10/import.c:255
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#: g10/import.c:267
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Celkovo spracovan�ch k���ov: %lu\n"
+
+#: g10/import.c:269
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "      presko�en� nov� k���e: %lu\n"
+
+#: g10/import.c:272
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "        bez identifik�torov: %lu\n"
+
+#: g10/import.c:274
+#, c-format
+msgid "              imported: %lu"
+msgstr "                importovan�: %lu"
+
+#: g10/import.c:280
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "                  bez zmien: %lu\n"
+
+#: g10/import.c:282
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "         nov� id u��vate�ov: %lu\n"
+
+#: g10/import.c:284
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "              nov� podk���e: %lu\n"
+
+#: g10/import.c:286
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "               nov� podpisy: %lu\n"
+
+#: g10/import.c:288
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "      nov� revok�cie k���ov: %lu\n"
+
+#: g10/import.c:290
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "      pre��tan� tajn� k���e: %lu\n"
+
+#: g10/import.c:292
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "    importovan� tajn� k���e: %lu\n"
+
+#: g10/import.c:294
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr "      tajn� k���e nezmenen�: %lu\n"
+
+#: g10/import.c:296
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr "           neimportovan�: %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s podpis, hashovac� algoritmus %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
+
+# c-format
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr ""
+"k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "k��� %08lX: nov� k��� - presko�en�\n"
+
+#: g10/import.c:755
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
+
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "zapisujem do '%s'\n"
+
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
+
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
+
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
+
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
+
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
+
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
+
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
+
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
+
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "k��� %08lX: \"%s\" bez zmeny\n"
+
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
+
+#: g10/import.c:1064
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
+
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "k��� %08lX: tajn� k��� importovan�\n"
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
+
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr ""
+"k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
+
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
+
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
+
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
+
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr ""
+"k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
+"\"\n"
+
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr ""
+"k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
+
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
+
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
+
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
+
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
+
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
+
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
+
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
+
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
+
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "k��� %08lX: podk��� presko�en�\n"
+
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
+
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
+
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
+
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
+
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr ""
+"VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
+"08lX\n"
+
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr ""
+"VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
+
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
+
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
+
+#: g10/keyedit.c:159
+msgid "[revocation]"
+msgstr "[revok�cia]"
+
+#: g10/keyedit.c:160
+msgid "[self-signature]"
+msgstr "[podpis k���a n�m sam�m]"
+
+#: g10/keyedit.c:237 g10/keylist.c:319
+msgid "1 bad signature\n"
+msgstr "1 zl� podpis\n"
+
+#: g10/keyedit.c:239 g10/keylist.c:321
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d zl�ch podpisov\n"
+
+#: g10/keyedit.c:241 g10/keylist.c:323
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
+
+#: g10/keyedit.c:243 g10/keylist.c:325
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
+
+#: g10/keyedit.c:245 g10/keylist.c:327
+msgid "1 signature not checked due to an error\n"
+msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
+
+#: g10/keyedit.c:247 g10/keylist.c:329
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
+
+#: g10/keyedit.c:249
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
+
+#: g10/keyedit.c:251
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr ""
+"zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = D�verujem �iasto�ne\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = D�verujem �plne\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
+
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
+msgid "  Unable to sign.\n"
+msgstr "  Nemo�no podp�sa�.\n"
+
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
+
+#: g10/keyedit.c:584
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Podpis k���a \"%s\" n�m sam�m je\n"
+"podpis vo form�te PGP 2.x.\n"
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"V� s��asn� podpis na \"%s\"\n"
+"je len lok�lny.\n"
+"\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
+
+#: g10/keyedit.c:632
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"V� s��asn� podpis na \"%s\"\n"
+"je len lok�lny.\n"
+"\n"
+
+#: g10/keyedit.c:636
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
+
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
+
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
+
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Ni� na podp�sanie k���om %08lX\n"
+
+#: g10/keyedit.c:702
+msgid "This key has expired!"
+msgstr "Platnos� k���a vypr�ala!"
+
+#: g10/keyedit.c:722
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "Platnos� k���a vypr�� %s.\n"
+
+#: g10/keyedit.c:726
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
+
+#: g10/keyedit.c:759
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
+
+#: g10/keyedit.c:761
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
+
+#: g10/keyedit.c:786
+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 ""
+"S akou istotou ste preverili, �e k���, ktor� chcete podp�sa�\n"
+"patr� vy��ie uvedenej osobe?\n"
+"Pokia� nepozn�te odpove�, zadajte \"0\".\n"
+
+#: g10/keyedit.c:791
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr "   (0) Neodpoviem.%s\n"
+
+#: g10/keyedit.c:793
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
+
+#: g10/keyedit.c:795
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr "   (2) �iasto�ne som to overil(a).%s\n"
+
+#: g10/keyedit.c:797
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "V� v�ber? ('?' - viac inform�ci�): "
+
+#: g10/keyedit.c:826
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Ste si ist�, �e chcete podp�sa� tento k���\n"
+"svoj�m k���om: \""
+
+#: g10/keyedit.c:835
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"\n"
+"Ide o podpis k���a n�m sam�m\n"
+
+#: g10/keyedit.c:839
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
+
+#: g10/keyedit.c:844
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
+
+#: g10/keyedit.c:851
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Podpis bude ozna�en� ako neexportovate�n�.\n"
+"\n"
+
+#: g10/keyedit.c:855
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
+
+#: g10/keyedit.c:860
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+"\n"
+"V�bec som tento k��� neoveril.\n"
+
+#: g10/keyedit.c:864
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+"\n"
+"�iasto�ne som overil tento k���.\n"
+
+#: g10/keyedit.c:868
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+"\n"
+"Velmi d�kladne som overil tento k���.\n"
+
+#: g10/keyedit.c:877
+msgid "Really sign? "
+msgstr "Skuto�ne podp�sa�? "
+
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "podpisovanie zlyhalo: %s\n"
+
+#: g10/keyedit.c:978
+msgid "This key is not protected.\n"
+msgstr "Tento k��� nie je chr�nen�.\n"
+
+#: g10/keyedit.c:982
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
+
+#: g10/keyedit.c:986
+msgid "Key is protected.\n"
+msgstr "k��� je chr�nen�.\n"
+
+#: g10/keyedit.c:1006
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Nie je mo�n� editova� tento k���: %s\n"
+
+#: g10/keyedit.c:1012
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
+"\n"
+
+#: g10/keyedit.c:1026
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"Nechcete heslo - to je *zl�* n�pad!\n"
+"\n"
+
+#: g10/keyedit.c:1029
+msgid "Do you really want to do this? "
+msgstr "Skuto�ne to chcete urobi�? "
+
+#: g10/keyedit.c:1095
+msgid "moving a key signature to the correct place\n"
+msgstr "pres�vam podpis k���a na spr�vne miesto\n"
+
+#: g10/keyedit.c:1138
+msgid "quit this menu"
+msgstr "ukon�i� toto menu"
+
+#: g10/keyedit.c:1139
+msgid "q"
+msgstr "u"
+
+#: g10/keyedit.c:1140
+msgid "save"
+msgstr "ulo�i�"
+
+#: g10/keyedit.c:1140
+msgid "save and quit"
+msgstr "ulo�i� a ukon�i�"
+
+#: g10/keyedit.c:1141
+msgid "help"
+msgstr "help"
+
+#: g10/keyedit.c:1141
+msgid "show this help"
+msgstr "uk�za� t�to pomoc"
+
+#: g10/keyedit.c:1143
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:1143
+msgid "show fingerprint"
+msgstr "vyp�sa� fingerprint"
+
+#: g10/keyedit.c:1144
+msgid "list"
+msgstr "list"
+
+#: g10/keyedit.c:1144
+msgid "list key and user IDs"
+msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
+
+#: g10/keyedit.c:1145
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:1146
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:1146
+msgid "select user ID N"
+msgstr "vyberte identifik�tor u��vate�a N"
+
+#: g10/keyedit.c:1147
+msgid "key"
+msgstr "key"
+
+#: g10/keyedit.c:1147
+msgid "select secondary key N"
+msgstr "vyberte sekund�rny k��� N"
+
+#: g10/keyedit.c:1148
+msgid "check"
+msgstr "check"
+
+#: g10/keyedit.c:1148
+msgid "list signatures"
+msgstr "vyp�sa� zoznam podpisov"
+
+#: g10/keyedit.c:1149
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:1150
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:1150
+msgid "sign the key"
+msgstr "podp�sa� k���"
+
+#: g10/keyedit.c:1151
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "vytvori� podpis oddelen� od dokumentu"
+
+#: g10/keyedit.c:1153
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:1153
+msgid "sign the key locally"
+msgstr "podp�sa� k��� lok�lne"
+
+#: g10/keyedit.c:1154
+msgid "nrsign"
+msgstr "nrsign"
+
+#: g10/keyedit.c:1154
+msgid "sign the key non-revocably"
+msgstr "podp�sa� k��� bez mo�nosti odvola� podpis (non-revocably)"
+
+#: g10/keyedit.c:1155
+msgid "nrlsign"
+msgstr "nrlsign"
+
+#: g10/keyedit.c:1155
+msgid "sign the key locally and non-revocably"
+msgstr "podp�sa� k��� lok�lne a bez mo�nosti odvola� podpis (non-revocably)"
+
+#: g10/keyedit.c:1156
+msgid "debug"
+msgstr "debug"
+
+#: g10/keyedit.c:1157
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:1157
+msgid "add a user ID"
+msgstr "prida� identifik�tor u��vate�a"
+
+#: g10/keyedit.c:1158
+msgid "addphoto"
+msgstr "addphoto"
+
+#: g10/keyedit.c:1158
+msgid "add a photo ID"
+msgstr "prida� fotografick� ID"
+
+#: g10/keyedit.c:1159
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:1159
+msgid "delete user ID"
+msgstr "zmaza� identifik�tor u��vate�a"
+
+#: g10/keyedit.c:1161
+msgid "delphoto"
+msgstr "delphoto"
+
+#: g10/keyedit.c:1162
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1162
+msgid "add a secondary key"
+msgstr "prida� sekund�rny k���"
+
+#: g10/keyedit.c:1163
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:1163
+msgid "delete a secondary key"
+msgstr "zmaza� sekund�rny k���"
+
+#: g10/keyedit.c:1164
+msgid "addrevoker"
+msgstr "addrevoker"
+
+#: g10/keyedit.c:1164
+msgid "add a revocation key"
+msgstr "prida� revoka�n� k���"
+
+#: g10/keyedit.c:1165
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:1165
+msgid "delete signatures"
+msgstr "zmaza� podpisy"
+
+#: g10/keyedit.c:1166
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:1166
+msgid "change the expire date"
+msgstr "zmeni� dobu platnosti"
+
+#: g10/keyedit.c:1167
+msgid "primary"
+msgstr "primary"
+
+#: g10/keyedit.c:1167
+msgid "flag user ID as primary"
+msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
+
+#: g10/keyedit.c:1168
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:1168
+msgid "toggle between secret and public key listing"
+msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
+
+#: g10/keyedit.c:1170
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:1171
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:1171
+msgid "list preferences (expert)"
+msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
+
+#: g10/keyedit.c:1172
+msgid "showpref"
+msgstr "showpref"
+
+#: g10/keyedit.c:1172
+msgid "list preferences (verbose)"
+msgstr "vyp�sa� zoznam predvolieb (podrobne)"
+
+#: g10/keyedit.c:1173
+msgid "setpref"
+msgstr "setpref"
+
+#: g10/keyedit.c:1173
+msgid "set preference list"
+msgstr "nastavi� zoznam predvolieb"
+
+#: g10/keyedit.c:1174
+msgid "updpref"
+msgstr "updpref"
+
+#: g10/keyedit.c:1174
+msgid "updated preferences"
+msgstr "aktualizova� predvo�by"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "chyba servera k���ov"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
+
+#: g10/keyedit.c:1176
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:1176
+msgid "change the passphrase"
+msgstr "zmeni� heslo"
+
+#: g10/keyedit.c:1177
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:1177
+msgid "change the ownertrust"
+msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
+
+#: g10/keyedit.c:1178
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:1178
+msgid "revoke signatures"
+msgstr "revokova� podpisy"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revsig"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "revokova� identifik�tor u��vate�a"
+
+#: g10/keyedit.c:1180
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:1180
+msgid "revoke a secondary key"
+msgstr "revokova� sekund�rny k���"
+
+#: g10/keyedit.c:1181
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:1181
+msgid "disable a key"
+msgstr "nastavi� k��� ako neplatn� (disable)"
+
+#: g10/keyedit.c:1182
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:1182
+msgid "enable a key"
+msgstr "nastavi� k��� ako platn� (enable)"
+
+#: g10/keyedit.c:1183
+msgid "showphoto"
+msgstr "showphoto"
+
+#: g10/keyedit.c:1183
+msgid "show photo ID"
+msgstr "uk�za� fotografick� ID"
+
+#: g10/keyedit.c:1202 g10/delkey.c:120
+msgid "can't do that in batchmode\n"
+msgstr "nemo�no previes� v d�vkovom m�de\n"
+
+#: g10/keyedit.c:1233
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
+
+#: g10/keyedit.c:1250
+msgid "Secret key is available.\n"
+msgstr "Tajn� k��� je dostupn�.\n"
+
+#: g10/keyedit.c:1282
+msgid "Command> "
+msgstr "Pr�kaz> "
+
+#: g10/keyedit.c:1312
+msgid "Need the secret key to do this.\n"
+msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
+
+#: g10/keyedit.c:1316
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
+
+#: g10/keyedit.c:1364
+msgid "Key is revoked."
+msgstr "K��� revokovan�."
+
+#: g10/keyedit.c:1383
+msgid "Really sign all user IDs? "
+msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
+
+#: g10/keyedit.c:1384
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
+
+#: g10/keyedit.c:1409
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
+
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+msgid "You must select at least one user ID.\n"
+msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
+
+#: g10/keyedit.c:1433
+msgid "You can't delete the last user ID!\n"
+msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
+
+#: g10/keyedit.c:1436
+msgid "Really remove all selected user IDs? "
+msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
+
+#: g10/keyedit.c:1437
+msgid "Really remove this user ID? "
+msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
+
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
+msgid "You must select at least one key.\n"
+msgstr "Mus�te vybra� aspo� jeden k���.\n"
+
+#: g10/keyedit.c:1478
+msgid "Do you really want to delete the selected keys? "
+msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
+
+#: g10/keyedit.c:1479
+msgid "Do you really want to delete this key? "
+msgstr "Skuto�ne chcete zmaza� tento k���? "
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Skuto�ne revokova� toto id u��vate�a? "
+
+#: g10/keyedit.c:1534
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Skuto�ne chcete revokova� vybran� k���e? "
+
+#: g10/keyedit.c:1535
+msgid "Do you really want to revoke this key? "
+msgstr "Skuto�ne chcete revokova� tento k���? "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "nastavi� zoznam predvolieb"
+
+#: g10/keyedit.c:1612
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
+
+#: g10/keyedit.c:1614
+msgid "Really update the preferences? "
+msgstr "Skuto�ne aktualizova� predvo�by? "
+
+#: g10/keyedit.c:1662
+msgid "Save changes? "
+msgstr "Ulo�i� zmeny? "
+
+#: g10/keyedit.c:1665
+msgid "Quit without saving? "
+msgstr "Ukon�i� bez ulo�enia? "
+
+#: g10/keyedit.c:1675
+#, c-format
+msgid "update failed: %s\n"
+msgstr "aktualiz�cia zlyhala: %s\n"
+
+#: g10/keyedit.c:1682
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
+
+#: g10/keyedit.c:1689
+msgid "Key not changed so no update needed.\n"
+msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
+
+#: g10/keyedit.c:1701
+msgid "Invalid command  (try \"help\")\n"
+msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Charakteristiky: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr "Tento k��� m��e by� revokovan� k���om %s "
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr "(citliv� inform�cia)"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "%s: nem��em vytvori�: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[revokovan�]"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [platnos� skon��: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [platnos� skon��: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " d�vera: %c/%c"
+
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
+msgid "This key has been disabled"
+msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
+
+#: g10/keyedit.c:2146
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! podk��� bol revokovan�: %s\n"
+
+#: g10/keyedit.c:2149
+msgid "rev- faked revocation found\n"
+msgstr "rev- n�jden� falo�n� revok�cia\n"
+
+#: g10/keyedit.c:2151
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? probl�m overenia revok�cie: %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[revokovan�]"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
+
+#: g10/keyedit.c:2207
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
+"by� spr�vne, pokia� znovu nespust�te program.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[revokovan�]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[expirovan�]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
+"sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
+
+#: g10/keyedit.c:2399
+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 ""
+"VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
+"           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
+
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
+
+#: g10/keyedit.c:2410
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
+
+#: g10/keyedit.c:2545
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
+
+#: g10/keyedit.c:2555
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
+
+#: g10/keyedit.c:2559
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
+
+#: g10/keyedit.c:2565
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
+
+#: g10/keyedit.c:2579
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Zmazan� %d podpis.\n"
+
+#: g10/keyedit.c:2580
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Zmazan�ch %d podpisov.\n"
+
+#: g10/keyedit.c:2583
+msgid "Nothing deleted.\n"
+msgstr "Ni� nebolo zmaznan�.\n"
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
+"           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
+
+#: g10/keyedit.c:2703
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
+
+#: g10/keyedit.c:2726
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
+
+#: g10/keyedit.c:2741
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
+
+#: g10/keyedit.c:2849
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
+
+#: g10/keyedit.c:2855
+msgid "Please select at most one secondary key.\n"
+msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
+
+#: g10/keyedit.c:2859
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
+
+#: g10/keyedit.c:2862
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
+
+#: g10/keyedit.c:2908
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
+
+#: g10/keyedit.c:2924
+msgid "No corresponding signature in secret ring\n"
+msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
+
+#: g10/keyedit.c:3004
+msgid "Please select exactly one user ID.\n"
+msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
+
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
+
+#: g10/keyedit.c:3377
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "Neexistuje sekund�rny k��� s indexom %d\n"
+
+#: g10/keyedit.c:3491
+msgid "user ID: \""
+msgstr "id u��vate�a: \""
+
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"podp�san� Va��m k���om %08lX v %s\n"
+
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"lok�lne podp�san� Va��m k���om %08lX v %s\n"
+
+#: g10/keyedit.c:3504
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "Platnos� podpisu vypr�� %s.\n"
+
+#: g10/keyedit.c:3508
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
+
+#: g10/keyedit.c:3512
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
+
+#: g10/keyedit.c:3537
+msgid "You have signed these user IDs:\n"
+msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
+
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   podp�san� %08lX v %s%s%s\n"
+
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   revokovan� %08lX v %s\n"
+
+#: g10/keyedit.c:3587
+msgid "You are about to revoke these signatures:\n"
+msgstr "Chyst�te sa revokova� tieto podpisy:\n"
+
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr "   podp�san� %08lX v %s%s\n"
+
+#: g10/keyedit.c:3599
+msgid " (non-exportable)"
+msgstr " (nexeportovate�n�)"
+
+#: g10/keyedit.c:3606
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
+
+#: g10/keyedit.c:3636
+msgid "no secret key\n"
+msgstr "neexistuje tajn� k���\n"
+
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr ""
+"Zobrazujem %s fotografick� ID s ve�kos�ou %ld pre k��� 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:179
+msgid "Critical signature policy: "
+msgstr "Kritick� podpisov� politika: "
+
+#: g10/keylist.c:181
+msgid "Signature policy: "
+msgstr "Podpisov� politika: "
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
+msgid "WARNING: invalid notation data found\n"
+msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
+
+#: g10/keylist.c:286
+msgid "Critical signature notation: "
+msgstr "Kritick� podpisov� not�cia: "
+
+#: g10/keylist.c:288
+msgid "Signature notation: "
+msgstr "Podpisov� not�cia: "
+
+#: g10/keylist.c:299
+msgid "not human readable"
+msgstr "nie je v priamo �itate�nom form�te"
+
+#: g10/keylist.c:400
+msgid "Keyring"
+msgstr "s�bor k���ov (keyring)"
+
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [platnos� skon��: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
+msgid " [expires: %s]"
+msgstr " [platnos� skon��: %s]"
+
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[revokovan�]"
+
+#: g10/keylist.c:1357
+msgid "Primary key fingerprint:"
+msgstr "Prim�rny fingerprint k���a:"
+
+#: g10/keylist.c:1359
+msgid "     Subkey fingerprint:"
+msgstr "     Fingerprint podk���a:"
+
+#: g10/keylist.c:1366
+msgid " Primary key fingerprint:"
+msgstr " Prim�rny fingerprint k���a:"
+
+#: g10/keylist.c:1368
+msgid "      Subkey fingerprint:"
+msgstr "      Fingerprint podk���a:"
+
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr "   Fingerprint k���a ="
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
+
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "nespr�vne heslo alebo nezn�my �ifrovac� algoritmus (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s k��� �ifrovan�ho sedenia\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s za�ifrovan� d�ta\n"
+
+#: g10/mainproc.c:305 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
+
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "verejn� k��� je %08lX\n"
+
+#: g10/mainproc.c:428
+msgid "public key encrypted data: good DEK\n"
+msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
+
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
+
+# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
+# [kw]
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "za�ifrovan� %s k���om, ID %08lX\n"
+
+#: g10/mainproc.c:486
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
+
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "za�ifrovan� s %lu heslami\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "za�ifrovan� jedn�m heslom\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr ""
+"algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
+"algoritmom %s\n"
+
+#: g10/mainproc.c:570
+msgid "decryption okay\n"
+msgstr "de�ifrovanie o.k.\n"
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
+
+#: g10/mainproc.c:587
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
+
+#: g10/mainproc.c:593
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "de�ifrovanie zlyhalo: %s\n"
+
+#: g10/mainproc.c:613
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
+
+#: g10/mainproc.c:615
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "p�vodn� meno s�boru='%.*s'\n"
+
+#: g10/mainproc.c:787
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr ""
+"samostatn� revoka�n� certifik�t -  pou�ite \"gpg --import\", ak ho chcete "
+"vyu�i�\n"
+
+#: g10/mainproc.c:1283
+msgid "signature verification suppressed\n"
+msgstr "verifik�cia podpisu potla�en�\n"
+
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
+msgid "can't handle these multiple signatures\n"
+msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
+
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Platnos� podpisu vypr�ala %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                alias \""
+
+# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "K��� k dispoz�cii na: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr "ZL� podpis od \""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
+msgid "Expired signature from \""
+msgstr "Podpis s vypr�anou platnos�ou od \""
+
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
+msgid "Good signature from \""
+msgstr "Dobr� podpis od \""
+
+#: g10/mainproc.c:1510
+msgid "[uncertain]"
+msgstr "[neist�]  "
+
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                alias \""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Platnos� podpisu vypr�ala %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Platnos� podpisu vypr�� %s\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s podpis, hashovac� algoritmus %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "bin�rne"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "textov� m�d"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "nezn�me"
+
+#: g10/mainproc.c:1668
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Nem��em overi� podpis: %s\n"
+
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
+msgid "not a detached signature\n"
+msgstr "toto nie je podpis oddelen� od dokumentu\n"
+
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
+
+#: g10/mainproc.c:1787
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "samostatn� podpis triedy 0x%02x\n"
+
+#: g10/mainproc.c:1844
+msgid "old style (PGP 2.x) signature\n"
+msgstr "podpis star�ho typu (PGP 2.x)\n"
+
+#: g10/mainproc.c:1854
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
+
+#: g10/misc.c:82
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
+
+#: g10/misc.c:146
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Experiment�lne algoritmy by sa nemali pou��va�!\n"
+
+#: g10/misc.c:176
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr ""
+"tento �ifrovac� algoritmus je zastaral�; pros�m, pou�ite nejak� "
+"�tandardnej��!\n"
+
+#: g10/misc.c:282
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "IDEA modul pre GnuPG nen�jden�\n"
+
+#: g10/misc.c:283
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"viac inform�ci� n�jdete v dokumente http://www.gnupg.cz/why-not-idea.html\n"
+
+#: g10/misc.c:491
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
+
+#: g10/misc.c:495
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+
+#: g10/misc.c:497
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "pou�ite namiesto neho \"%s%s\" \n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Nekomprimovan�"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Nekomprimovan�"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "t�to spr�va nemus� pou�ite�n� s %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "��tam mo�nosti z `%s'\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "nezn�my implicitn� adres�t `%s'\n"
+
+#: g10/parse-packet.c:120
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+"VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
+
+#: g10/parse-packet.c:1128
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
+
+#: g10/passphrase.c:461 g10/passphrase.c:508
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
+
+#: g10/passphrase.c:469
+msgid "can't set client pid for the agent\n"
+msgstr "nem��em nastavi� PID klienta pre gpg-agenta\n"
+
+#: g10/passphrase.c:477
+msgid "can't get server read FD for the agent\n"
+msgstr "nemo�no z�ska� server read file descriptor pre agenta\n"
+
+#: g10/passphrase.c:484
+msgid "can't get server write FD for the agent\n"
+msgstr "nemo�no z�ska� server write file descriptor pre agenta\n"
+
+#: g10/passphrase.c:517
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
+
+#: g10/passphrase.c:530
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
+
+#: g10/passphrase.c:551
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "nem��em sa pripoji� k `%s': %s\n"
+
+#: g10/passphrase.c:573
+msgid "communication problem with gpg-agent\n"
+msgstr "probl�m v komunik�cii s gpg-agentom\n"
+
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+msgid "problem with the agent - disabling agent use\n"
+msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
+
+#: g10/passphrase.c:681
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (hlavn� ID k���a %08lX)"
+
+#: g10/passphrase.c:691
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Potrebujete heslo, aby ste odomkli tajn� k��� pre u��vate�a:\n"
+"\"%.*s\"\n"
+"k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
+
+#: g10/passphrase.c:713
+msgid "Repeat passphrase\n"
+msgstr "Opakova� heslo\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Vlo�i� heslo\n"
+
+#: g10/passphrase.c:753
+msgid "passphrase too long\n"
+msgstr "heslo je pr�li� dlh�\n"
+
+#: g10/passphrase.c:766
+msgid "invalid response from agent\n"
+msgstr "neplatn� reakcia od agenta\n"
+
+#: g10/passphrase.c:781 g10/passphrase.c:874
+msgid "cancelled by user\n"
+msgstr "zru�en� u��vate�om\n"
+
+#: g10/passphrase.c:786 g10/passphrase.c:963
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "probl�m s agentom: agent vracia 0x%lx\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Vlo�te heslo: "
+
+#: g10/passphrase.c:1131
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
+"u��vate�a: \""
+
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
+
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (hlavn� ID k���a %08lX)"
+
+#: g10/passphrase.c:1213
+msgid "Repeat passphrase: "
+msgstr "Opakujte heslo: "
+
+#: g10/plaintext.c:90
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
+
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "chyba pri vytv�ran� `%s': %s\n"
+
+#: g10/plaintext.c:438
+msgid "Detached signature.\n"
+msgstr "Podpis oddelen� od dokumentu.\n"
+
+#: g10/plaintext.c:442
+msgid "Please enter name of data file: "
+msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
+
+#: g10/plaintext.c:463
+msgid "reading stdin ...\n"
+msgstr "��tam �tandardn� vstup (stdin) ...\n"
+
+#: g10/plaintext.c:497
+msgid "no signed data\n"
+msgstr "ch�baj� podp�san� d�ta\n"
+
+#: g10/plaintext.c:505
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
+
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymn� adres�t; sk��am tajn� k��� %08lX ...\n"
+
+#: g10/pubkey-enc.c:119
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "o.k., my sme anonymn� adres�t.\n"
+
+#: g10/pubkey-enc.c:207
+msgid "old encoding of the DEK is not supported\n"
+msgstr "star� k�dovanie DEK nie je podporov�n�\n"
+
+#: g10/pubkey-enc.c:228
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "�ifrovac� algoritmus %d%s je neznam� alebo je zak�zan�\n"
+
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "POZN�MKA: v predvo�b�ch nen�jden� �ifrovac� algoritmus %d\n"
+
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "POZN�MKA: k��� bol revokovan�"
+
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr "tajn� �asti k���a nie s� dostupn�\n"
+
+#: g10/seckey-cert.c:60
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
+
+#: g10/seckey-cert.c:250
+msgid "Invalid passphrase; please try again"
+msgstr "Neplatn� heslo; pros�m, sk�ste to znovu"
+
+#: g10/seckey-cert.c:251
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:311
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "VAROVANIE: Zisten� slab� k��� - zme�te, pros�m, znovu heslo.\n"
+
+#: g10/seckey-cert.c:349
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+"generujem zastaral� 16 bitov� kontroln� s��et na ochranu tajn�ho k���a\n"
+
+#: g10/sig-check.c:75
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "VAROVANIE: konflikt hashu podpisu v spr�ve\n"
+
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr ""
+"VAROVANIE: podpisovac� podk��� %08lX m� neplatn� kr��ov� certifik�ciu\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
+
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
+
+#: g10/sig-check.c:180
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
+"je probl�m so syst�mov�m �asom)\n"
+
+#: g10/sig-check.c:182
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
+"je probl�m so syst�mov�m �asom)\n"
+
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "POZN�MKA: podpisov�mu k���u %08lX skon�ila platnos� %s\n"
+
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"predpoklad�m neplatn� podpis k���om %08lX, preto�e je nastaven� nezn�my "
+"kritick� bit\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "k��� %08lX: neexistuje podk��� pre viazanie podk���ov\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "nem��em prida� dodato�n� �daje do v3 (PGP 2.x �t�l) podpisov k���ov\n"
+
+#: g10/sign.c:112
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr ""
+"VAROVANIE: nemo�no %%-expandova� not�cie (pr�li� dlh�). Pou�it� "
+"neexpandovan�.\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "nem��em prida� politiku URL do v3 (PGP 2.x �t�l) podpisov k���ov\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr ""
+"VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
+"neexpandovan�.\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+"VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
+"neexpandovan�.\n"
+
+#: g10/sign.c:364
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
+
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s podpis od: \"%s\"\n"
+
+#: g10/sign.c:550
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
+
+#: g10/sign.c:741
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
+
+#: g10/sign.c:765 g10/sign.c:1001
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "%s: nem��em vytvori�: %s\n"
+
+#: g10/sign.c:794
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr ""
+"vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
+
+#: g10/sign.c:886
+msgid "signing:"
+msgstr "podpisujem:"
+
+#: g10/sign.c:985
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
+"x\n"
+
+#: g10/sign.c:1138
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "bude pou�it� �ifrovanie %s\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "nem��em pracova� s riadkami dlh��mi ako %d znakov\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
+
+#: g10/tdbio.c:128 g10/tdbio.c:1434
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "z�znam v datab�ze d�very %lu: lseek() sa nepodaril: %s\n"
+
+#: g10/tdbio.c:134 g10/tdbio.c:1441
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "z�znam v datab�ze d�very %lu: z�pis sa nepodaril (n=%d): %s\n"
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
+
+#: g10/tdbio.c:497
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: nem��em pristupova� k: %s\n"
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: adres�r neexistuje!\n"
+
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: nem��em vytvori� z�mok\n"
+
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: nem��em zamkn��\n"
+
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: nem��em vytvori�: %s\n"
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
+
+#: g10/tdbio.c:549
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
+
+#: g10/tdbio.c:552
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: datab�za d�very vytvoren�\n"
+
+#: g10/tdbio.c:592
+msgid "NOTE: trustdb not writable\n"
+msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
+
+#: g10/tdbio.c:608
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: neplatn� datab�ze d�very\n"
+
+#: g10/tdbio.c:640
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
+
+#: g10/tdbio.c:648
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
+
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
+
+#: g10/tdbio.c:1163
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
+
+#: g10/tdbio.c:1171
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
+
+#: g10/tdbio.c:1192
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: nie je s�bor datab�zy d�very\n"
+
+#: g10/tdbio.c:1210
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: z�znam verzie s ��slom %lu\n"
+
+#: g10/tdbio.c:1215
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: neplatn� verzia s�boru %d\n"
+
+#: g10/tdbio.c:1400
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
+
+#: g10/tdbio.c:1408
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: chyba pri z�pise adres�rov�ho z�znamu: %s\n"
+
+#: g10/tdbio.c:1418
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
+
+#: g10/tdbio.c:1448
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
+
+#: g10/tdbio.c:1493
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "datab�za d�very je po�koden�; pros�m spustite \"gpg --fix-trustdb\".\n"
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "`%s' nie je platn� dlh� keyID\n"
+
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "k��� %08lX: akceptovan� ako d�veryhodn� k���\n"
+
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "k��� %08lX sa v datab�ze d�very vyskytuje viac ako raz\n"
+
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr ""
+"k��� %08lX: nen�jden� verejn� k��� k d�veryhodn�mu k���u - presko�en�\n"
+
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
+
+#: g10/trustdb.c:344
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "z�znam d�very %lu, typ po�. %d: ��tanie zlyhalo: %s\n"
+
+#: g10/trustdb.c:350
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
+
+#: g10/trustdb.c:365 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
+
+#: g10/trustdb.c:380 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "nikdy     "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
+msgid "no need for a trustdb check\n"
+msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
+
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "dal�ia kontrola datab�zy d�very %s\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "pros�m vykonajte --check-trustdb\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "kontrolujem datab�zu d�very\n"
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
+
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"podpis nebolo mo�n� overi�.\n"
+"Pros�m, nezab�dajte, �e s�bor s podpisom (.sig alebo .asc)\n"
+"by mal by� prv�m s�borom zadan�m na pr�kazovom riadku.\n"
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "vstupn� riadok %u je pr�li� dlh� alebo na konci ch�ba znak LF\n"
+
+#: 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 ""
+"k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem��em ho pou�i� s "
+"falo�n�m RNG!\n"
+
+#: g10/skclist.c:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "presko�en� `%s': duplikovan�\n"
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "presko�en� `%s': %s\n"
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
+
+#: g10/skclist.c:179
+#, fuzzy, c-format
+msgid ""
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
+"signatures!\n"
+msgstr ""
+"presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
+"podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "S�bor `%s' existuje. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Prep�sa� (a/N)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: nezn�ma pr�pona\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Vlo�te nov� n�zov s�boru"
+
+#: g10/openfile.c:183
+msgid "writing to stdout\n"
+msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
+
+#: g10/openfile.c:282
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
+
+#: g10/openfile.c:349
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "vytvoren� nov� konfigura�n� s�bor `%s'\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
+
+#: g10/openfile.c:380
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: nem��em vytvori� adres�r: %s\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: adres�r vytvoren�\n"
+
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"VAROVANIE: spr�va bola za�ifrovan� slab�m k���om v symetrickej �ifre.\n"
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr "probl�m so za�ifrovan�m paketom\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "vytvoren� slab� k��� - sk��am znovu\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr ""
+"nem��em sa vyvarova� slab�ho k���a pre symetrick� �ifru; oper�ciu som sk�sil "
+"%d kr�t!\n"
+
+#: g10/seskey.c:210
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA po�aduje pou�itie 160 bitov�ho hashovacieho algoritmu\n"
+
+#: g10/delkey.c:121 g10/delkey.c:128
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(pokia� neur��te k��� jeho fingerprintom)\n"
+
+#: g10/delkey.c:127
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "bez parametra \"--yes\" to nemo�no v d�vkovom m�de previes�\n"
+
+#: g10/delkey.c:139
+msgid "Delete this key from the keyring? "
+msgstr "Zmaza� tento k��� zo s�boru k���ov? "
+
+#: g10/delkey.c:147
+msgid "This is a secret key! - really delete? "
+msgstr "Toto je tajn� k���! - skuto�ne zmaza�? "
+
+#: g10/delkey.c:157
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+
+#: g10/delkey.c:167
+msgid "ownertrust information cleared\n"
+msgstr "inform�cie o d�veryhodnosti vlastn�ka k���a vymazan�\n"
+
+#: g10/delkey.c:195
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
+
+#: g10/delkey.c:197
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
+
+#: g10/helptext.c:48
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Je na V�s, aby ste sem priradili hodnotu; t�to hodnota nebude nikdy\n"
+"exportovan� tretej strane. Potrebujeme ju k implement�cii \"pavu�iny\n"
+"d�very\"; nem� to ni� spolo�n� s (implicitne vytvorenou) \"pavu�inou\n"
+"certifik�tov\"."
+
+#: g10/helptext.c:54
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"Aby bolo mo�n� vybudova� pavu�inu d�very, mus� GnuPG vedie�, ktor�m k���om\n"
+"d�verujete absol�tne - oby�ajne s� to tie k���e, pre ktor� m�te pr�stup\n"
+"k tajn�m k���om. Odpovedzte \"ano\", aby ste nastavili tieto k���e\n"
+"ako absol�tne d�veryhodn�\n"
+
+#: g10/helptext.c:61
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr "Pokia� aj tak chcete pou�i� tento revokovan� k���, odpovedzte \"ano\"."
+
+#: g10/helptext.c:65
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr ""
+"Pokia� aj tak chcete pou�i� tento ned�veryhodn� k���, odpovedzte \"ano\"."
+
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Vlo�te identifik�tor adres�ta, ktor�mu chcete posla� spr�vu."
+
+#: g10/helptext.c:73
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+
+#: g10/helptext.c:87
+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 ""
+"V�ebecne nemo�no odpor��a� pou��va� rovnak� k��� na �ifrovanie a "
+"podeisovanie\n"
+"Tento algoritmus je vhodn� pou�i� len za ur�it�ch podmienok.\n"
+"Kontaktujte pros�m najprv bezpe�nostn�ho �pecialistu."
+
+#: g10/helptext.c:94
+msgid "Enter the size of the key"
+msgstr "Vlo�te d�ku k���a"
+
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
+msgid "Answer \"yes\" or \"no\""
+msgstr "Odpovedzte \"ano\" alebo \"nie\""
+
+#: g10/helptext.c:108
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Vlo�te po�adovan� hodnotu tak, ako je uveden� v pr�kazovom riadku.\n"
+"Je mo�n� vlo�i� d�tum vo form�te ISO (RRRR-MM-DD), ale nedostanete\n"
+"spr�vnu chybov� hl�ku - miesto toho syst�m sk�si interpretova�\n"
+"zadan� hodnotu ako interval."
+
+#: g10/helptext.c:120
+msgid "Enter the name of the key holder"
+msgstr "Vlo�te meno dr�ite�a k���a"
+
+#: g10/helptext.c:125
+msgid "please enter an optional but highly suggested email address"
+msgstr "pros�m, vlo�te e-mailov� adresu (nepovinn�, ale ve�mi odpor��an�)"
+
+#: g10/helptext.c:129
+msgid "Please enter an optional comment"
+msgstr "Pros�m, vlo�te nepovinn� koment�r"
+
+#: g10/helptext.c:134
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N  pre zmenu n�zvu.\n"
+"C  pre zmenu koment�ra.\n"
+"E  pre zmenu e-mailovej adresy.\n"
+"O  pre pokra�ovanie generovania k���a.\n"
+"Q  pre ukon�enie generovania k���a."
+
+#: g10/helptext.c:143
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "Ak chcete generova� podk���, odpovedzte \"ano\" (alebo len \"a\")."
+
+#: g10/helptext.c:151
+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"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"Sk�r ako podp��ete id u��vate�a, mali by ste najprv overi�, �i k���\n"
+"patr� osobe, ktorej meno je uveden� v identifik�tore u��vate�a.\n"
+"Je ve�mi u�ito�n�, ke� ostatn� vedia, ako d�sledne ste previedli\n"
+"tak�to overenie.\n"
+"\n"
+"\"0\" znamen�, �e neuv�dzate, ako d�sledne ste pravos� k���a overili\n"
+"\n"
+"\"1\" znamen�, �e ver�te tomu, �e k��� patr� osobe, ktor� je uveden�,\n"
+"    v u��vate�skom ID, ale nemohli ste alebo jste nepreverili t�to "
+"skuto�nos�.\n"
+"    To je u�ito�n� pre \"osobn�\" verifik�ciu, ke� podpisujete k���e, ktor�\n"
+"    pou��vaj� pseudonym u��vate�a.\n"
+"\n"
+"\"2\" znamen�, �e ste �iasto�ne overili pravos� k���a. Napr. ste overili\n"
+"    fingerprint k���a a skontrolovali identifik�tor u��vate�a\n"
+"    uveden� na k���i s fotografick�m id.\n"
+"\n"
+"\"3\" Znamen�, �e ste vykonali ve�mi d�kladn� overenie pravosti k���a.\n"
+"    To m��e napr�klad znamena�, �e ste overili fingerprint k���a \n"
+"    jeho vlastn�ka osobne a �alej ste pomocou ta�ko fal�ovate�n�ho \n"
+"    dokumentu s fotografiou (napr�klad pasu) overili, �e meno majite�a\n"
+"    k���a sa zhoduje s menom uveden�m v u��vate�skom ID a �alej ste \n"
+"    overili (v�menou elektronick�ch dopisov), �e elektronick� adresa "
+"uveden� \n"
+"    v ID u��vate�a patr� majite�ovi k���a.\n"
+"\n"
+"Pros�m nezab�dajte, �e pr�klady uveden� pre �rove� 2 a 3 s� *len*\n"
+"pr�klady.\n"
+"Je len na Va�om rozhodnut�, �o \"�iasto�n�\" a \"d�kladn�\" overenie "
+"znamen�\n"
+"ke� budete podpisova� k���e in�m u��vate�om.\n"
+"\n"
+"Pokia� neviete, ak� je spr�vna odpove�, odpovedzte \"0\"."
+
+#: g10/helptext.c:189
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr ""
+"Pokia� chcete podp�sa� V�ETKY identifik�tory u��vate�ov, odpovedzte \"ano\""
+
+#: g10/helptext.c:193
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Pokia� skuto�ne chcete zmaza� tento identifik�tor u��vate�a, odpovedzte \"ano"
+"\".\n"
+"V�etky certifik�ty bud� tie� straten�!"
+
+#: g10/helptext.c:198
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Odpovedzte \"ano\", pokia� chcete zmaza� podk���"
+
+#: g10/helptext.c:203
+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 ""
+"Toto je platn� podpis k���a; norm�lne nechcete tento podpis zmaza�,\n"
+"preto�e m��e by� d�le�it� pri vytv�ran� d�very k���a alebo in�ho k���a\n"
+"ceritifikovan�ho t�mto k���om."
+
+#: g10/helptext.c:208
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"Tento podpis nem��e by� overen�, preto�e nem�te zodpovedaj�ci verejn� k���.\n"
+"Jeho zmazanie by ste mali odlo�i� do �asu, ke� budete vedie�, ktor� k���\n"
+"bol pou�it�, preto�e tento podpisovac� k��� m��e vytvori� d�veru\n"
+"prostredn�ctvom in�ho u� certifikovan�ho k���a."
+
+#: g10/helptext.c:214
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr "Podpis je neplatn�. Je rozumn� ho odstr�ni� z V�ho s�boru k���ov."
+
+#: g10/helptext.c:218
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"Toto je podpis, ktor� via�e identifik�tor u��vate�a ku k���u. Zvy�ajne\n"
+"nie je dobr� tak�to podpis odstr�ni�. GnuPG nem��e tento k��� na�alej\n"
+"pou��va�. Urobte to len v pr�pade, ke� je tento podpis k���a\n"
+"n�m sam�m z nejak�ho d�vodu neplatn� a ke� je k dispoz�cii in� k���."
+
+#: g10/helptext.c:226
+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 ""
+"Zmeni� predvo�by pre v�etky u��vate�sk� ID (alebo len pre ozna�en�)\n"
+"na aktu�lny zoznam predvolieb. �asov� raz�tka v�etk�ch dotknut�ch podpisov\n"
+"k���ov nimi samotn�mi bud� posunut� o jednu sekundu dopredu.\n"
+
+#: g10/helptext.c:233
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+
+#: g10/helptext.c:239
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr ""
+"Pros�m, zopakujte posledn� heslo, aby ste si boli ist�, �o ste nap�sali."
+
+#: g10/helptext.c:243
+msgid "Give the name of the file to which the signature applies"
+msgstr "Zadajte n�zov s�boru, ku ktor�mu sa podpis vz�ahuje"
+
+#: g10/helptext.c:248
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Ak si prajete prep�sanie s�boru, odpovedzte \"ano\""
+
+#: g10/helptext.c:253
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"Pros�m, vlo�te nov� n�zov s�boru. Ak len stla��te RETURN, bude\n"
+"pou�it� implicitn� s�bor (ktor� je zobrazen� v z�tvork�ch)."
+
+#: g10/helptext.c:259
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"Mali by ste �pecifikova� d�vod certifik�cie. V z�vislosti na kontexte\n"
+"m�te mo�nos� si vybra� zo zoznamu:\n"
+"  \"k��� bol kompromitovan�\"\n"
+"      Toto pou�ite, pokia� si mysl�te, �e k V�mu tajn�mu k���u z�skali\n"
+"       pr�stup neopr�vnen� osoby.\n"
+"  \"k��� je nahraden�\"\n"
+"      Toto pou�ite, pokia� ste tento k��� nahradili nov��m k���om.\n"
+"  \"k��� sa u� nepou��va\"\n"
+"      Toto pou�ite, pokia� tento k��� u� nepou��vate.\n"
+"  \"Identifik�tor u��vate�a u� nie je platn�\"\n"
+"      Toto pou�ite, pokia� by sa identifik�tor u��vate�a u� nemal pou��va�;\n"
+"      norm�lne sa pou��va na ozna�enie neplatnej e-mailov� adresy.\n"
+
+#: g10/helptext.c:275
+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 ""
+"Ak chcete, m��ete vlo�i� text popisuj�c� p�vod vzniku tohto revoka�n�ho\n"
+"ceritifik�tu. Pros�m, stru�ne. \n"
+"Text kon�� pr�zdnym riadkom.\n"
+
+#: g10/helptext.c:290
+msgid "No help available"
+msgstr "Pomoc nie je k dispoz�cii"
+
+#: g10/helptext.c:298
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Pomoc nie je dostupn� pre '%s'"
+
+#: g10/keydb.c:189
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+
+#: g10/keydb.c:196
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
+
+#: g10/keydb.c:615
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
+
+#: g10/keyring.c:1236
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "VAROVANIE: Existuj� dva s�bory s tajn�mi inform�ciami.\n"
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s je bez zmeny\n"
+
+#: g10/keyring.c:1239
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s je nov�\n"
+
+#: g10/keyring.c:1240
+msgid "Please fix this possible security flaw\n"
+msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
+
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Vyberte si obr�zok, ktor� bude pou�it� ako fotografick� ID. Tento obr�zok\n"
+"mus� by� vo form�te JPEG. Pam�tajte, �e bude ulo�en� vo Va�om verejnom "
+"k���i.\n"
+"Ak pou�ijete ve�mi ve�k� obr�zok, k��� bude tie� ve�k�! Odpor��an� ve�kos�\n"
+"obr�zka je okolo 240x288.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Meno s�bor s fotografiou vo form�te JPEG: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Nemo�no otvori� fotografiu \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" nie je s�bor JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Je t�to fotografia spr�vna (a/N/u)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "nemo�no nastavi� exec-path na %s\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "�iadne vzialen� vykon�vanie programu nie je podporovan�\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "nem��em vytvori� adres�r `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"volanie extern�ho programu zru�en� kv�li nebezpe�n�m pr�vam s�boru "
+"nastaven�\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"t�to platforma potrebuje do�asn� s�bory na spustenie extern�ho programu\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "nemo�no spusti� %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "syst�mov� chyba pri volan� extern�ho programu: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "nekorektn� ukon�enie extern�ho programu\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "nemo�no spusti� extern� program\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "nemo�no c�ta� odozvu extern�ho programu: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "VAROVANIE: nem��em vymaza� do�asn� adres�r `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "nikdy     "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet zlyhala: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Bude revokovan�:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Toto je citliv� revoka�n� k���)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "Vyn�ten� ASCII textov� v�stup.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet zlyhala: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "nezn�my ochrann� algoritmus\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Bol vytvoren� revoka�n� certifik�t.\n"
+"\n"
+"Presu�te ho na m�dium, ktor� m��ete schova�; ak Mallory z�ska k\n"
+"tomuto certifik�tu pr�stup, m��e znefunk�ni� V� k���. Jednoduch� je\n"
+"vytla�i� certifik�t a schova� ho, pre pr�pad �e by m�dium bolo ne�itate�n�.\n"
+"Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
+"spr�stupni� ich in�m!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "Zru�i�"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "D�vod na revok�ciu: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(�iadny popis)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Je to v poriadku? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Zoznam pridelen�ch hodn�t d�veryhodnosti, vytvoren� %s\n"
+"# (Pou�ite \"gpg --import-ownertrust\" na obnovenie)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "nemo�no otvori� s�bor: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "riadok je pr�li� dlh�\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "chyba: ch�ba �iarka\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "chyba: neplatn� odtla�ok\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "chyba: �iadna �rove� d�veryhodnosti\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "chyba pri h�adan� z�znamu d�very: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "chyba pri ��tan�: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "VAROVANIE: hash `%s' nie je s��as�ou OpenPGP. Pou�itie na vlastn� "
+#~ "nebezpe�ie!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[s�bor]|�ifrova� s�bor"
+
+#~ msgid "store only"
+#~ msgstr "len ulo�enie"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[s�bor]|de�ifrova� s�bor"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "podp�sa� k��� bez mo�nosti revok�cie podpisu"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr ""
+#~ "podp�sa� k��� lok�lne a bez mo�nosti\n"
+#~ " revok�cie podpisu"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "vyp�sa� len poradie paketov"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr ""
+#~ "exportova� hodnoty d�veryhodnosti\n"
+#~ " vlastn�ka k���a"
+
+#~ msgid "import ownertrust values"
+#~ msgstr ""
+#~ "importova� hodnoty d�veryhodnosti\n"
+#~ " vlastn�ka k���a"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "neinterakt�vna aktualiz�cia datab�zy d�very"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "opravi� naru�en� datab�zu d�very"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Dek�dova� ASCII s�bor alebo std. vstup"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Zak�dova� s�bor alebo std. vstup do ASCII"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr ""
+#~ "pou�i� implicitn� k��� ako implicitn�ho\n"
+#~ " adres�ta"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "v�bec nepou��va� termin�l"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "vyn�ti� podpisy verzie 3"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "nevynucova� podpisy verzie 3"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "vyn�ti� podpisy verzie 4"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "nevynucova� podpisy verzie 4"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "na �ifrovanie v�dy pou�i� MDC"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "na �ifrovanie nikdy nepou�i� MDC"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "pou�ite gpg-agenta"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "automaticky odpoveda� �no na v��inu ot�zok"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr ""
+#~ "prida� tento s�bor k���ov do zoznamu\n"
+#~ " pou��van�ch s�borov k���ov"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr ""
+#~ "|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
+#~ " k���ov"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
+
+#~ msgid "read options from file"
+#~ msgstr "��ta� nastavenia zo s�boru"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[s�bor]|zap�� inform�ciu o stave do s�boru"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|k���|�plne d�verova� tomuto k���u"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "emulova� m�d pop�san� v RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "nastav v�etky vlastnosti paketov, �ifier\n"
+#~ " a hashov ako v OpenPGP"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "nastav v�etky vlastnosti paketov, �ifier\n"
+#~ " a hashov ako v PGP 2.x"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|pou�i� m�d hesla N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|ALG|pou�i� hashovac� algoritmus ALG pre hesl�"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|pou�i� kompresn� algoritmus N"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr ""
+#~ "zahodi� identifik�tor k���a zo �ifrovan�ch\n"
+#~ " paketov"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Zobrazi� fotografick� ID"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Nezobrazova� fotografick� ID"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr ""
+#~ "Nastavi� pr�kazov� riadok na prehliadanie\n"
+#~ " fotografick�ho ID"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "hashovac� algoritmus `%s' je len na ��tanie v tejto verzii\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "kompresn� algoritmus mus� by� v rozmedz� %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Nie je ist�, �i tento podpis patr� vlastn�kovi, napriek\n"
+#~ "tomu je akceptovan�\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "predvo�ba %c%lu nie je platn�\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "k��� %08lX: nie je vo form�te RFC 2440 - presko�en�\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "POZN�MKA: N�jden� prim�rny k��� Elgamal - import m��e chv��u trva�\n"
+
+#~ msgid " (default)"
+#~ msgstr "de�ifrova� d�ta (implicitne)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  vytvoren�: %s platnos� do: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Not�cie: "
+
+#~ msgid "Policy: "
+#~ msgstr "Politika: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "po�adujem k��� %08lX z %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "nem��em dosta� k��� zo servera k���ov: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "chyba pri posielan� na `%s': %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "�spe�n� odoslanie na `%s' (status=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "zlyhalo posielanie na `%s': (status=%u)\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "tento server k���ov nepodporuje --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "nem��em preh�ad�va� server k���ov: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "k��� %08lX: toto je k��� algoritmu ElGamal vygenerovan� v PGP - podpisy "
+#~ "n�m vytvoren� NIE S� bezpe�n�!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "k��� %08lX bol vytvoren� %lu sekund v bud�cnosti (do�lo ku zmene �asu "
+#~ "alebo\n"
+#~ "je probl�m so syst�mov�m �asom)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "k��� %08lX bol vytvoren� %lu sekund v bud�cnosti (do�lo ke zmene �asu "
+#~ "alebo\n"
+#~ "je probl�m so syst�mov�m �asom)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "k��� %08lX ozna�en� ako absol�tne d�veryhodn�.\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "podpis od podpisov�ho k���a Elgamal %08lX po %08lX presko�en�\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "podpis od %08lX po podpisov� k��� Elgamal %08lX presko�en�\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "kontrola v h�bke %d podp�san�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Vyberte algoritmus.\n"
+#~ "\n"
+#~ "DSA (naz�van� tie� DSS) je algoritmus digit�lneho podpisu, ktor� m��e "
+#~ "by�\n"
+#~ "pou�it� len pre podpisy. Je to odpor��an� algoritmus, preto�e overenie\n"
+#~ "DSA podpisov je ove�a r�chlej�� ako v algoritme ElGamal.\n"
+#~ "\n"
+#~ "Algoritmus ElGamal m��e by� pou��van� ako na podpisy tak na �ifrovanie.\n"
+#~ "�tandard OpenPGP rozli�uje medzi dvoma re�imami tohto algoritmu:\n"
+#~ "len �ifrovanie a �ifrovanie+podpis; v podstate je to rovnak�, ale "
+#~ "nieko�ko\n"
+#~ "parametrov mus� by� vybran�ch �peci�lnym sp�sobom pre vytvorenie "
+#~ "bezpe�n�ho k���a\n"
+#~ "pre podpisy: tento program to vie, ale nie je vy�adovan�, aby aj in�\n"
+#~ "implement�cie OpenPGP pracovali v re�ime podpis+�ifrovanie.\n"
+#~ "\n"
+#~ "Prv� (prim�rny) k��� mus� by� v�dy k���, ktor� je schopn� podpisova�;\n"
+#~ "to je d�vod, pre�o v tomto menu nie je k dispoz�cii k��� algoritmu "
+#~ "ElGamal\n"
+#~ "ur�en� len na �ifrovanie."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Hoci s� tieto k���e definovan� v RFC2440, nie s� odpor��an�,\n"
+#~ "preto�e nie s� podporov�n� v�etk�mi programami a podpisy nimi vytvoren�\n"
+#~ "s� dos� ve�k� a na overenie ve�mi pomal�."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "%lu k���ov u� skontrolovan�ch (%lu podpisov)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "k��� nekompletn�\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "k��� %08lX: nekompletn�\n"
diff --git a/po/sv.po b/po/sv.po
index a3eb755ee..7ed61ac4b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,67 +1,91 @@
 # Swedish messages for gnupg
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Daniel Resare <[email protected]>, 1999.
 #
-# Thanks to Andr� Dahlqvist <[email protected]> for
-# many improvements
+# Per Tunedal <[email protected]>, 2002
 #
-# Also many thanks to my wife Olivia <[email protected]> for
-# patience, help and suggestions
+# ===================================================
+# This a completely revised and extended translation.
+# 167 fuzzy translations have been revised and
+# 84 new messages have been translated.
+# All translations have been revised and updated.
+# In total 673 messages have been translated.
+# ===================================================
+#
+# First translator Daniel Resare <[email protected]>, 1999-2002,
+# who sends his thanks to Andr� Dahlqvist <[email protected]>
+# and to his wife Olivia <[email protected]>. 
 #
 # $Id$
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2001-08-23 10:32+02:00\n"
-"Last-Translator: Daniel Resare <[email protected]>\n"
+"Project-Id-Version: gnupg 1.2.1\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-12-03 16:11+0100\n"
+"Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
 msgstr "Varning: anv�nder os�kert minne!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr ""
+msgstr "se http://www.gnupg.org/faq.html f�r mer information\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "operationen �r ej m�jlig utan tillg�ng till s�kert minne\n"
+msgstr "operationen �r inte m�jlig utan tillg�ng till s�kert minne\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha anv�nt fel program f�r denna uppgift)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
 msgstr "nej"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
 msgstr "avsluta"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
 msgstr "aA"
 
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "allm�nt fel"
@@ -78,17 +102,13 @@ msgstr "ok�nd version"
 msgid "unknown pubkey algorithm"
 msgstr "ok�nd algoritm f�r publik nyckel"
 
-# jag �r inte n�jd med �vers�ttningen digest -> kontrollsumma,
-# om du har ett b�ttre f�rslag kontakta mig g�rna p�
-# [email protected]. Andra f�rslag jag s�gat �r digest (o�versatt),
-# fingeravtryck, indatakarakteristik, sammandrag och sammanfattning
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "ok�nd algoritm f�r ber�kning av kontrollsumma"
+msgstr "ok�nd algoritm f�r ber�kning av sammandrag"
 
 #: util/errors.c:59
 msgid "bad public key"
-msgstr "felaktig publik nyckel"
+msgstr "felaktig offentlig (publik) nyckel"
 
 #: util/errors.c:60
 msgid "bad secret key"
@@ -104,15 +124,15 @@ msgstr "fel vid ber�kning av kontrollsumma"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "felaktig l�senordsfras"
+msgstr "felaktig l�senmening"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "hittade inte publik nyckel"
+msgstr "hittade inte offentlig (publik) nyckel"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "ok�nd chifferalgoritm"
+msgstr "ok�nd krypteringsalgoritm"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
@@ -140,7 +160,7 @@ msgstr "fel hemlig nyckel har anv�nts"
 
 #: util/errors.c:72
 msgid "not supported"
-msgstr "ej st�dd"
+msgstr "inte st�dd"
 
 #: util/errors.c:73
 msgid "bad key"
@@ -168,15 +188,15 @@ msgstr "fel vid skapande av fil"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "felaktig l�senordsfras"
+msgstr "felaktig l�senmening"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "algoritmen f�r publik nyckel �r ej implementerad"
+msgstr "algoritmen f�r publik nyckel �r inte inf�rd"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "chifferalgorimten �r ej implementerad"
+msgstr "krypteringsalgorimten �r inte inf�rd"
 
 #: util/errors.c:82
 msgid "unknown signature class"
@@ -249,7 +269,7 @@ msgstr "felaktig URI"
 
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "ej st�dd URI"
+msgstr "denna URI st�ds inte"
 
 #: util/errors.c:100
 msgid "network error"
@@ -257,93 +277,98 @@ msgstr "n�tverksfel"
 
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "ej krypterad"
+msgstr "inte krypterad"
 
 #: util/errors.c:103
 msgid "not processed"
 msgstr "inte behandlade"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
-msgstr "oanv�ndbar publik nyckel"
+msgstr "oanv�ndbar offentlig (publik) nyckel"
 
 #: util/errors.c:106
 msgid "unusable secret key"
 msgstr "oanv�ndbar hemlig nyckel"
 
 #: util/errors.c:107
-#, fuzzy
 msgid "keyserver error"
-msgstr "allm�nt fel"
+msgstr "nyckelserverfel"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
 
-#: util/logger.c:249
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... detta �r ett fel i programmet (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status p� \"%s\": %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" �r inte �n vanlig fil - ignorerad\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed �r tom\n"
 
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "varning: random_seed har en felaktig storlek och anv�nds d�rf�r inte\n"
+msgstr "varning: slumpk�rnan har en felaktig storlek och anv�nds d�rf�r inte\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte l�sa \"%s\": %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte st�nga \"%s\": %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: anv�nder en os�ker slumptalsgenerator!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -352,7 +377,7 @@ msgid ""
 "\n"
 msgstr ""
 "Slumptalsgeneratorn �r bara ett lappverk f�r att\n"
-"f� den att fungera - den �r inte p� n�got s�tt en\n"
+"f� programmet att fungera - den �r inte p� n�got s�tt en\n"
 "stark slumptalsgenerator!\n"
 "\n"
 "ANV�ND INGEN DATA GENERERAD AV DETTA PROGRAM!!\n"
@@ -370,7 +395,29 @@ msgstr ""
 "en stund f�r att ge operativsystemet en chans att samla mer entropi!\n"
 "(Beh�ver %d fler byte)\n"
 
-#: g10/g10.c:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr ""
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+
+#: cipher/primegen.c:120
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr ""
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -378,170 +425,128 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr ""
-
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
-msgstr "endast kryptering med symmetriskt chiffer"
+msgstr "endast symetrisk kryptering"
 
-#: g10/g10.c:315
-msgid "store only"
-msgstr "endast lagring"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr ""
-
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/g10.c:323
-msgid "check key signatures"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:327
-#, fuzzy
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
-msgstr "ta bort en nyckel fr�n den publika nyckelringen"
+msgstr "ta bort nycklar fr�n den offentliga (publika)nyckelringen"
 
-#: g10/g10.c:329
-#, fuzzy
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
-msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
+msgstr "ta bort nycklar fr�n den hemliga nyckelringen"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:332
-#, fuzzy
-msgid "sign a key non-revocably"
-msgstr "signera en nyckel lokalt"
-
-#: g10/g10.c:333
-#, fuzzy
-msgid "sign a key locally and non-revocably"
-msgstr "signera en nyckel lokalt"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
-msgstr "generera ett �terkallelesecertifikat"
+msgstr "generera ett sp�rrcertifikat"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:341
-#, fuzzy
+#: g10/g10.c:388
 msgid "search for keys on a key server"
-msgstr "exportera nycklar till en nyckelserver"
+msgstr "s�k efter nycklar hos en nyckelserver"
 
-#: g10/g10.c:343
-#, fuzzy
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
-msgstr "importera nycklar fr�n en nyckelserver"
+msgstr "uppdatera alla nycklar nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "skriv endast ut paketsekvensen"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "exportera de v�rden som representerar �gartillit"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "importera v�rden som representerar �gartillit"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:357
-#, fuzzy
-msgid "unattended trust database update"
-msgstr "uppdatera tillitsdatabasen"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "reparera en korrupt tillitsdatabas"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "Skala av en fil eller standard in"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "Skapa ett skal f�r en fil eller standard in"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -551,202 +556,55 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "anv�nd standardnyckeln som standardmottagare"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 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:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "var n�got tystare"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "anv�nd inte terminalen alls"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "anv�nd v3-signaturer"
-
-#: g10/g10.c:397
-#, fuzzy
-msgid "do not force v3 signatures"
-msgstr "anv�nd v3-signaturer"
-
-#: g10/g10.c:398
-#, fuzzy
-msgid "force v4 key signatures"
-msgstr "anv�nd v3-signaturer"
-
-#: g10/g10.c:399
-#, fuzzy
-msgid "do not force v4 key signatures"
-msgstr "anv�nd v3-signaturer"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "anv�nd alltid en MDC f�r kryptering"
-
-#: g10/g10.c:402
-#, fuzzy
-msgid "never use a MDC for encryption"
-msgstr "anv�nd alltid en MDC f�r kryptering"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
 msgstr ""
 
-# syftar p� ett anv�ndargr�nsnitt i ett separat program, till exempel gpa
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "anv�nd gpg-agenten"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "batch-l�ge: fr�ga aldrig"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "anta att svaret �r ja p� de flesta fr�gor"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "anta att svaret �r nej p� de flesta fr�gor"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "l�gg till denna nyckelring till listan av nyckelringar"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "l�gg till denna hemliga nyckelring till listan"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr ""
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "l�s flaggor fr�n fil"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|skriv statusinformation till denna FD"
-
-#: g10/g10.c:427
-#, fuzzy
-msgid "|[file]|write status info to file"
-msgstr "|FD|skriv statusinformation till denna FD"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|NYCKELID|lita ovillkorligen p� denna nyckel"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|FIL|ladda till�ggsmodul FIL"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "imitera l�get som beskrivs i RFC1991"
-
-#: g10/g10.c:442
-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:443
-#, 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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|anv�nd l�senordsl�get N"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|anv�nd komprimeringsalgoritmen N"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
 msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -754,7 +612,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -774,17 +632,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera g�rna fel till <[email protected]>.\n"
 "Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -794,7 +652,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -802,320 +660,483 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr ""
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr ""
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr ""
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+#, fuzzy
+msgid "Compression: "
+msgstr "Kommentar: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:983
-#, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
 
-#: g10/g10.c:986
-#, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
 
-#: g10/g10.c:989
-#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr ""
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
+
+#: g10/g10.c:1205
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
 msgstr ""
 
-#: g10/g10.c:1168
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "VARNING: %s os�ker �gare till %s\n"
+
+#: g10/g10.c:1334
 #, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "%s: ny inst�llningsfil skapad\n"
+
+#: g10/g10.c:1601
+#, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "OBSERVERA: inst�llningsfilen \"%s\" saknas\n"
+msgstr "OBSERVERA: inst�llningsfilen \"%s\" anv�nds inte\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBSERVERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, 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:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
-msgstr ""
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2124
 #, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "VARNING: \"%s\" �r en tom fil\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s: felaktiga exportalternativ %d\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2127
 #, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "felaktiga exportalternativ\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: felaktiga importalternativ %d\n"
+
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "felaktigt skal"
+msgstr "felaktiga importalternativ\n"
 
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "VARNING: \"%s\" �r en tom fil\n"
+msgstr "%s: felaktiga exportalternativ %d\n"
 
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "felaktig nyckelring"
+msgstr "felaktiga exportalternativ\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s: felaktiga importalternativ %d\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "felaktiga importalternativ\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s: felaktiga exportalternativ %d\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "felaktiga exportalternativ\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr ""
+msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr ""
+msgstr "VARNING: %s g�ller ist�llet f�r %s\n"
 
-#: g10/g10.c:1699 g10/g10.c:1710
-#, 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:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, 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:1731
+#: g10/g10.c:2435
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
+"du kan bara skapa fr�nkopplade signaturereller klartextsignaturer\n"
+"tillsammans med --pgp2\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
+"du kan inte b�de signera och kryptera samtidigt tillsammans med --pgp2\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr ""
+msgstr "du m�ste anv�nda filer (och inte r�r) tillsammans med --pgp2\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
+"f�r att kryptera meddelanden med --pgp2 kr�vs IDEA-insticksprogrammet\n"
 
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr ""
-
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
-msgstr "den valda chifferalgoritmen �r ogiltig\n"
+msgstr "den valda krypteringsalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1830
+#: g10/g10.c:2540
 #, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "den valda krypteringsalgoritmen �r ogiltig\n"
+
+#: g10/g10.c:2546
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1845
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
-
 # jag bed�mer att detta och de f�ljande �r interna felmeddelanden
 # som det �r i princip om�jligt att �vers�tta p� p� ett bra s�tt.
 # Sannolikheten f�r att anv�ndaren drabbas av felmeddelandet
 # �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:1847
+#: g10/g10.c:2561
 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:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" m�ste ha ett v�rde mellan 1 och 255\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "ogiltig standardv�rde f�r test-niv�; m�ste vara 0, 1, 2 eller 3\n"
+
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "ogiltig standardv�rde f�r test-niv�; m�ste vara 0, 1, 2 eller 3\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBSERVERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 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:1862
-#, 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:1868
-#, fuzzy
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "skriv ut inst�llningar"
+msgstr "ogiltiga standardinst�llningar\n"
 
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "skriv ut inst�llningar"
+msgstr "felaktiga inst�llningar av krypteringsalgoritm\n"
 
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "skriv ut inst�llningar"
+msgstr "felaktiga inst�llningar av checksummealgoritm\n"
 
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "skriv ut inst�llningar"
+msgstr "felaktiga inst�llningar av kompressionsalgoritm\n"
+
+#: g10/g10.c:2633
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
+
+#: g10/g10.c:2680
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
+
+#: g10/g10.c:2685
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
+
+#: g10/g10.c:2690
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2778
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
+"VARNING: Du har valt mottagare (-r) trots att symetrisk kryptering valts\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [filnamn]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
 #, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [filnamn]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
-msgstr "--symmetric [filnamn]"
+msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2110
-#, fuzzy
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
-msgstr "--sign-key anv�ndaridentitet"
+msgstr "--nrsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2118
-#, fuzzy
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
-msgstr "--lsign-key anv�ndaridentitet"
+msgstr "--nrlsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 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:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/g10.c:3096
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/g10.c:3098
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/g10.c:3109
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/g10.c:3119
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "misslyckades med att uppdatera hemligheten: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 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:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte �ppna \"%s\"\n"
 
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1123,89 +1144,126 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+#, fuzzy
+msgid "a user notation name must contain the '@' character\n"
+msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
+
+#: g10/g10.c:3678
 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:2737
-#, fuzzy
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
-msgstr "angiven URL �r ogiltig\n"
+msgstr "den angivna URL som beskriver certifikationspolicy �r ogiltig\n"
 
-#: g10/g10.c:2739
-#, fuzzy
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
-msgstr "angiven URL �r ogiltig\n"
+msgstr "den angivna URL som beskriver signaturpolicy �r ogiltig\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "den angivna URL som beskriver signaturpolicy �r ogiltig\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "var n�got tystare"
+
+#: g10/gpgv.c:68
+#, fuzzy
+msgid "take the keys from this keyring"
+msgstr "Vill du ta bort denna nyckel fr�n nyckelringen? "
+
+#: g10/gpgv.c:70
+#, fuzzy
+msgid "make timestamp conflicts only a warning"
+msgstr "konflikt mellan tidsst�mplar"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|skriv statusinformation till denna FD"
+
+#: g10/gpgv.c:95
+#, fuzzy
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
 
-#: g10/armor.c:314
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
 msgstr "skal: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
 msgstr "felaktig rubrikrad i skalet: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
 msgstr "rad i skalet: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
 msgstr "felaktig rubrikrad i klartextsignatur\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer g�r in i varandra\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
 msgstr "felaktig bindestreck-kodad rad: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
 msgstr "ov�ntat skal:"
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades �ver\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "f�r tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
 msgstr "f�r tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-fel; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
 msgstr "f�r tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "felaktigt skal: raden �r l�ngre �n %d tecken\n"
 
-#: g10/armor.c:1066
+#: g10/armor.c:1100
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1213,54 +1271,58 @@ msgstr ""
 "beror sannolikt p� att en felaktig epostserver eller epostklient har "
 "anv�nts\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam �vers�ttning. funderar p� "ersatt av n�got b�ttre" men det
 # k�nns inte heller bra
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
 msgstr "Nyckeln �r ersatt"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin s�kerhet"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
 msgstr "Nyckeln anv�nds inte l�ngre"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
 msgstr "Anv�ndaridentiteten �r inte l�ngre giltig"
 
 #: g10/pkclist.c:73
-#, fuzzy
 msgid "reason for revocation: "
-msgstr "Anledning till �terkallelsen: "
+msgstr "Anledning till sp�rren: "
 
 #: g10/pkclist.c:90
-#, fuzzy
 msgid "revocation comment: "
-msgstr "�terkallelsekommentar: "
+msgstr "Sp�rrkommentar: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr ""
 
-#: g10/pkclist.c:258
-#, fuzzy, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
-"%lu har inte tilldelats n�got tillitsv�rde:\n"
+"Inget tillitsv�rde tilldelat till:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
 #, fuzzy
+msgid "          \""
+msgstr "      �ven k�nd som \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "      �ven k�nd som \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1272,330 +1334,347 @@ msgstr ""
 "(genom att unders�ka pass, unders�ka fingeravtryck fr�n olika\n"
 "k�llor...)?\n"
 "\n"
-" 1 = Vet ej\n"
+" 1 = Vet inte\n"
 " 2 = Jag litar INTE p� denna anv�ndare\n"
 " 3 = Jag litar marginellt p� denna anv�ndare\n"
 " 4 = Jag litar fullst�ndigt p� denna anv�ndare\n"
 " s = visa mig mer information\n"
 
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
-msgstr ""
-
-#: g10/pkclist.c:274
+#: g10/pkclist.c:250
 #, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = Vet inte\n"
+
+#: g10/pkclist.c:252
+#, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%08lX: Vi litar INTE p� denna nyckel\n"
+msgstr " %d = Jag litar INTE p� denna anv�ndare\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr ""
+msgstr " %d = Jag litar maginellt p� denna anv�ndare\n"
 
-#: g10/pkclist.c:276
-#, fuzzy, c-format
+#: g10/pkclist.c:256
+#, c-format
 msgid " %d = I trust fully\n"
-msgstr "%s: ej en tillitsdatabasfil\n"
+msgstr " %d = Jag litar fullst�ndigt p� denna anv�ndare\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr ""
+msgstr " %d = Jag litar helt och h�llet p� denna anv�ndare\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
-msgstr ""
+msgstr " i = visa mer information\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
 msgstr " m = g� tillbaka till huvudmenyn\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
-msgstr ""
+msgstr " s = hoppa �ver denna nyckel\n"
 
 # q skall bytas ut mot a s�fort det kollas upp s� att q ocks� funkar.
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
 msgstr " q = avsluta\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
 msgstr "Vad v�ljer du? "
 
-#: g10/pkclist.c:316
-#, fuzzy
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Vill du verkligen ta bort denna nyckel? "
+msgstr "Vill du verkligen ge denna nyckel slutglitig tillit? "
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en p�litlig nyckel:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
-msgstr "nyckeln %08lX: nyckeln har �terkallats!\n"
+msgstr "nyckeln %08lX: nyckeln har sp�rrats!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
 msgstr "Vill du anv�nda nyckeln trots det? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
-msgstr "nyckeln %08lX: en undernyckel har �terkallats!\n"
+msgstr "nyckeln %08lX: en undernyckel har sp�rrats!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: nyckeln har blivit f�r gammal\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:430
 #, fuzzy, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"         Det finns inget som indikerar att signaturen tillh�r �garen.\n"
+"%08lX: Det finns inget som indikerar att signaturen verkligen tillh�r "
+"�garen.\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Vi litar INTE p� denna nyckel\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Det �r inte s�kert att denna nyckel verkligen tillh�r �garen\n"
-"men den accepteras trots detta\n"
+"%08lX: Det finns inget som indikerar att signaturen verkligen tillh�r "
+"�garen.\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
 msgstr "Denna nyckel tillh�r sannolikt �garen\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillh�r oss\n"
 
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"Det �r INTE s�kert att nyckeln tillh�r sin �gare. Om du\n"
+"Det �r INTE s�kert att nyckeln tillh�r den uppgivna personen. Om du\n"
 "*verkligen* vet vad du g�r, kan du svara ja p� n�sta fr�ga\n"
 "\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Anv�nder en nyckel som inte �r betrodd!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "VARNING: nyckeln %08lX kan ha sp�rrats: Sp�rrnyckeln %08lX saknas.\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "VARNING: Denna nyckel har sp�rrats av sin �gare!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "VARNING: Denna nyckel har �terkallats av sin �gare!\n"
+msgstr "VARNING: Denna nyckel har sp�rrats av sin �gare!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Detta kan betyda att signaturen �r en f�rfalskning.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "VARNING: Denna undernyckel har �terkallats av sin �gare!\n"
+msgstr "VARNING: Denna undernyckel har sp�rrats av sin �gare!\n"
 
-#: g10/pkclist.c:580
-#, fuzzy
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
-msgstr "Denna nyckel har deaktiverats"
+msgstr "Notera: Denna nyckel har deaktiverats.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
 msgstr "Notera: Denna nyckel har g�tt ut!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel �r inte certifierad med en p�litlig signatur!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Det finns inget som indikerar att signaturen tillh�r �garen.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE p� denna nyckel!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen �r sannolikt en F�RFALSKNING.\n"
 
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel �r inte certifierad med signaturer med ett\n"
 "tillr�ckligt h�gt tillitsv�rde!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: %s �verhoppad\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: hoppade �ver: publik nyckel finns redan\n"
+msgstr "%s: hoppade �ver: offentlig (publik) nyckel finns redan\n"
 
-#: g10/pkclist.c:811
-#, fuzzy
+#: g10/pkclist.c:829
 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"
+msgstr ""
+"Du specificerade ingen anv�ndaridentitet. (du kan anv�nda \"-r\") f�r detta\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
 
-#: g10/pkclist.c:824
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
 msgstr "Hittade inte anv�ndaridentiteten.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
-"hoppade �ver: den publika nyckeln �r redan satt som f�rvald mottagare\n"
+"hoppade �ver: den offentliga (publika) nyckeln �r redan satt som f�rvald "
+"mottagare\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
-msgstr "Den publika nyckeln �r deaktiverad\n"
+msgstr "Den offentliga (publika) nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:870
-#, fuzzy
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
-msgstr "%s: hoppade �ver: publik nyckel finns redan\n"
+msgstr "hoppade �ver: offentlig (publik) nyckel redan angiven\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "den f�rvalda mottagaren \"%s\" �r ok�nd\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: hoppade �ver: den publika nyckeln �r deaktiverad\n"
+msgstr "%s: hoppade �ver: den offentliga (publika) nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr ""
-
-#: g10/keygen.c:189
+#: g10/keygen.c:207
 #, fuzzy, c-format
-msgid "preference %c%lu duplicated\n"
-msgstr "hoppade �ver \"%s\": kopia\n"
+msgid "preference `%s' duplicated\n"
+msgstr "inst�llningen %c%lu �r dubblerad\n"
 
-#: g10/keygen.c:194
-#, fuzzy, c-format
-msgid "too many `%c' preferences\n"
-msgstr "skriv ut inst�llningar"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "f�r m�nga `%c' inst�llningar\n"
 
-#: g10/keygen.c:264
+#: g10/keygen.c:216
 #, fuzzy
-msgid "invalid character in preference string\n"
-msgstr "Ogiltigt tecken i namnet\n"
+msgid "too many digest preferences\n"
+msgstr "f�r m�nga `%c' inst�llningar\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "f�r m�nga `%c' inst�llningar\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "Ogiltigt tecken i inst�llningsstr�ngen\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:738
 #, fuzzy
 msgid "writing direct signature\n"
 msgstr "skriver sj�lvsignatur\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
-msgstr "skriver sj�lvsignatur\n"
+msgstr "skriver egensignatur\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; anv�nder %u bitar\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad upp�t till %u bitar\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:948
+#: g10/keygen.c:1171
 #, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (signering och kryptering)\n"
-
-#: g10/keygen.c:949
-#, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) DSA (endast signering)\n"
+msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:951
-#, fuzzy, c-format
+#: g10/keygen.c:1173
+#, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) ElGamal (endast kryptering)\n"
+msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signering och kryptering)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
 msgstr "Vad v�ljer du? "
 
-#: 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:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1608,37 +1687,29 @@ msgstr ""
 "              den f�rvalda nyckelstorleken �r 1024 bitar\n"
 "    den st�rsta f�reslagna nyckelstorleken �r 2048 bitar\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 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:1027
+#: g10/keygen.c:1241
 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:1030
+#: g10/keygen.c:1244
 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"
 
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
 #, 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:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1646,11 +1717,11 @@ msgstr ""
 "Nyckelstorlekar st�rre �n 2048 �r inte att rekommendera\n"
 "eftersom ber�kningar tar MYCKET l�ng tid!\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1658,18 +1729,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:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfr�gade nyckelstorleken �r %u bitar\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, 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:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1686,8 +1757,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:1126
-#, fuzzy
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1697,37 +1767,35 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 "Specificera hur l�nge nyckeln skall vara giltig.\n"
-"         0 = nyckeln blir aldrig ogiltig\n"
-"      <n>  = nyckeln blir ogiltig efter n dagar\n"
-"      <n>w = nyckeln blir ogiltig efter n veckor\n"
-"      <n>m = nyckeln blir ogiltig efter n m�nader\n"
-"      <n>y = nyckeln blir ogiltig efter n �r\n"
+"         0 = signaturen blir aldrig ogiltig\n"
+"      <n>  = signaturen blir ogiltig efter n dagar\n"
+"      <n>w = signaturen blir ogiltig efter n veckor\n"
+"      <n>m = signaturen blir ogiltig efter n m�nader\n"
+"      <n>y = signaturen blir ogiltig efter n �r\n"
 
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
 msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
 
-#: g10/keygen.c:1150
-#, fuzzy
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
-msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
+msgstr "F�r hur l�ng tid �r signaturen giltig? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
 msgstr "ogiltigt v�rde\n"
 
-#: g10/keygen.c:1160
-#, fuzzy, c-format
+#: g10/keygen.c:1374
+#, c-format
 msgid "%s does not expire at all\n"
-msgstr "Nyckeln g�r aldrig ut\n"
+msgstr "Giltighetstiden f�r %s g�r aldrig ut\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
-#, fuzzy, c-format
+#: g10/keygen.c:1381
+#, c-format
 msgid "%s expires at %s\n"
-msgstr "Nyckeln g�r ut vid f�ljande tidpunkt: %s\n"
+msgstr "Giltighetstiden f�r %s g�r ut vid f�ljande tidpunkt: %s\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1735,11 +1803,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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
 msgstr "St�mmer detta (j/n)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1755,44 +1823,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
 msgstr "Namnet f�r inte b�rja med en siffra\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet m�ste vara �tminstone 5 tecken l�ngt\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
 msgstr "Epostadressen �r ogiltig\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du anv�nder teckenupps�ttningen \"%s\"\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1803,57 +1871,56 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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:1327
+#: g10/keygen.c:1542
 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:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
 msgstr "R�tta f�rst felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"Du beh�ver en l�senordsfras f�r att skydda din hemliga nyckel\n"
+"Du beh�ver en l�senmening f�r att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
-#, fuzzy
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
-msgstr "l�senordsfrasen upprepades ej korrekt; f�rs�k igen.\n"
+msgstr "l�senmeningen upprepades inte korrekt; f�rs�k igen."
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
-msgstr ""
+msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"Du vill inte ha n�gon l�senordsfras - det �r sannolikt en *d�lig* id�!\n"
-"Jag kommer att g�ra det �nd�. Du kan �ndra din l�senordsfras n�rsomhelst\n"
+"Du vill inte ha n�gon l�senmening - det �r sannolikt en *d�lig* id�!\n"
+"Jag kommer att g�ra det �nd�. Du kan �ndra din l�senmening n�r som helst\n"
 "om du anv�nder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
@@ -1865,54 +1932,59 @@ 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:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+#, fuzzy
+msgid "sorry, can't do this in batch mode\n"
+msgstr "kan inte g�ra detta i batch-l�ge\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbr�ts.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
-msgstr "skriver publik nyckel till \"%s\"\n"
+msgstr "skriver offentlig (publik) nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "skriver hemlig nyckel till \"%s\"\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2205
-#, fuzzy, c-format
+#: g10/keygen.c:2565
+#, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
+msgstr "hittade ingen offentlig (publik) nyckelring: %s\n"
 
-#: g10/keygen.c:2211
-#, fuzzy, c-format
+#: g10/keygen.c:2571
+#, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
+msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/keygen.c:2225
-#, fuzzy, c-format
+#: g10/keygen.c:2589
+#, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+msgstr "fel vid skrivning av offentliga (publika) nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2232
-#, fuzzy, c-format
+#: g10/keygen.c:2596
+#, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
-msgstr "publik och hemlig nyckel skapad och signerad.\n"
-
-#: g10/keygen.c:2253
-#, fuzzy
-msgid "key marked as ultimately trusted.\n"
-msgstr "Certifikat som leder till en p�litlig nyckel:\n"
+msgstr "offentlig (publik) och hemlig nyckel �r skapade och signerade.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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"
@@ -1921,13 +1993,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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format beh�vs inte i singularis
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1935,7 +2007,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:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1943,623 +2015,738 @@ msgstr ""
 "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
-msgstr ""
+msgstr "--output kan inte anv�ndas f�r detta kommando\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan inte �ppna: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "fel vid skapandet av l�senordsfras: %s\n"
+msgstr "fel vid skapandet av l�senmening: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "kan inte anv�nda symetriska ESK-paket pga S2K-l�ge\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
 #, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "signeringen misslyckades: %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
 msgid "`%s' already compressed\n"
-msgstr "%lu nycklar behandlade\n"
+msgstr "`%s' �r redan komprimerad\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
+"du kan endast krypterar till RSA nycklar som �r h�gst 2048 bitar l�nga i --"
+"pgp2-l�ge\n"
 
-#: g10/encode.c:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fr�n \"%s\"\n"
 
-#: g10/encode.c:456
+#: g10/encode.c:516
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr ""
+msgstr "kan inte anv�nda IDEA-kryptering f�r alla nycklar du krypterar till.\n"
 
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
+"att kr�va symetrisk kryptering med %s (%d) strider mot mottagarnas "
+"inst�llningar\n"
 
-#: g10/encode.c:558 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:703
+#: g10/encode.c:634 g10/sign.c:863
 #, c-format
-msgid "you may not use %s while in %s mode\n"
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
+"att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens "
+"inst�llningar\n"
 
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s krypterad f�r: %s\n"
+msgstr "%s/%s krypterad f�r: \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 
-#: g10/export.c:246
+#: g10/export.c:206
 #, fuzzy, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "nyckeln %08lX: ny nyckel - �verhoppad\n"
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - �verhoppad\n"
 
-#: g10/export.c:347
+#: g10/export.c:353
+#, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr ""
+
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
 msgstr "[Hittade inte anv�ndaridentiteten]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Ogiltig nyckel %08lX  tvingat giltig med --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
+"det finns en hemlig nyckel tillh�rande denna offentliga (publika) nyckel!\"%s"
+"\"!\n"
 
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
 msgstr "anv�nder sekund�ra nyckeln %08lX ist�llet f�r prim�rnyckeln %08lX\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr ""
+"nyckel %08lX: hemlig nyckel utan offentlig (publik) nyckel - hoppade �ver\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar �ver block av typen %d\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          �verhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan anv�ndaridentiteter: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      of�r�ndrade: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya anv�ndaridentiteter: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "     nya �terkallelser av nycklar: %lu\n"
+msgstr "  nya sp�rrar av nycklar: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal l�sta hemliga nycklar: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal of�r�ndrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
 msgid "          not imported: %lu\n"
-msgstr "                      importerade: %lu"
+msgstr "                   inte importerade: %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:576
 #, c-format
-msgid "key %08lX: no user ID\n"
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s-signatur fr�n: %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
 
-#: g10/import.c:597
+# eller �r det en skadad HKP-nyckel som reparerats?
+#: g10/import.c:707
 #, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "nyckel %08lX: HKP-skadad undernyckel reparerad\n"
 
 # vad inneb�r fnutten i slutet?
-#: g10/import.c:612
+#: g10/import.c:722
 #, fuzzy, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "nyckel %08lX: accepterade icke sj�lvsignerad anv�ndaridentitet '"
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr ""
+"nyckel %08lX: accepterade anv�ndaridentitet ID '%s' som saknar egensignatur\n"
 
-#: g10/import.c:619
-#, c-format
-msgid "key %08lX: no valid user IDs\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga anv�ndaridentiteter\n"
 
-#: g10/import.c:621
+#: g10/import.c:730
 msgid "this may be caused by a missing self-signature\n"
-msgstr "detta kan bero p� att det saknas en sj�lvsignatur\n"
+msgstr "detta kan bero p� att det saknas en egensignatur\n"
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
-msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "nyckel %08lX: hittade ingen offentlig (publik) nyckel: %s\n"
 
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
 msgstr "nyckeln %08lX: ny nyckel - �verhoppad\n"
 
-#: g10/import.c:646
-#, fuzzy, c-format
+#: g10/import.c:755
+#, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:663
+# fixme: I appended the %s -wk
+#: g10/import.c:785
 #, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "nyckel %08lX: importerade publik nyckel\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "nyckel %08lX: importerade offentlig (publik) nyckel (\"%s\")\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte v�r lokala kopia\n"
 
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte l�sa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:740
+#: g10/import.c:866
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "nyckel %08lX: 1 ny anv�ndaridentitet\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "nyckel %08lX: \"%s\" 1 ny anv�ndaridentitet\n"
 
-#: g10/import.c:743
+#: g10/import.c:869
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya anv�ndaridentiteter\n"
 
-#: g10/import.c:746
+#: g10/import.c:872
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:749
+#: g10/import.c:875
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:752
+#: g10/import.c:878
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:755
+#: g10/import.c:881
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
+msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:774
+#: g10/import.c:902
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
+msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %08lX: inte f�r�ndrad\n"
 
-#: g10/import.c:844
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr ""
+"nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade "
+"�ver\n"
+
+#: g10/import.c:1064
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen f�rvald publik nyckel\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln �r importerad\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"nyckel %08lX: ingen publik nyckel - kan inte till�mpa "
-"�terkallelsecertifikatet\n"
+"nyckel %08lX: offentlig (publik) nyckel saknas - kan inte sp�rra nyckeln med "
+"sp�rrcertifikatet (revocation certificate)\n"
 
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "nyckel %08lX: ogiltigt �terkallelsecertifikat: %s - avvisat\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "nyckel %08lX: ogiltigt sp�rrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:969
+#: g10/import.c:1219
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "nyckel %08lX: �terkallelsecertifikat importerat\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "nyckel %08lX: \"%s\" sp�rrcertifikat importerat\n"
 
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet f�r signaturen\n"
 
-#: g10/import.c:1030
+# fixme: I appended the %s -wk
+#: g10/import.c:1299
 #, 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"
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr ""
+"nyckel %08lX: algoritmen f�r offentlig (publik) nyckel st�ds inte (\"%s\")\n"
 
-#: g10/import.c:1032
+#: g10/import.c:1301
 #, fuzzy, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "nyckel %08lX: ogiltig egensignatur\n"
 
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
 
-#: g10/import.c:1055 g10/import.c:1096
-#, 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:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "nyckel %08lX: algoritmen f�r offentlig (publik) nyckel st�ds inte\n"
 
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
+msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1369
 #, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "nyckel %08lX: ingen undernyckel f�r sp�rr av nyckeln\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1382
 #, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "nyckel %08lX.%lu: Giltig �terkallelse av undernyckel\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "nyckel %08lX: ogiltig sp�rr av undernyckel\n"
 
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
 #, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "nyckel %08lX: tog bort ogiltig sp�rr av undernyckel\n"
 
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
 msgstr "nyckel %08lX: hoppade �ver anv�ndaridentitet '"
 
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
 msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade �ver\n"
 
-#: g10/import.c:1203
-#, 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:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr ""
+"nyckel %08lX: sp�rrcertifikat (revocation certificate) p� fel plats - "
+"hoppade �ver\n"
 
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "nyckel %08lX: felaktigt �terkallelsecertifikat: %s - hoppade �ver\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr ""
+"nyckel %08lX: felaktigt sp�rrcertifikat (revocation certificate): %s - "
+"hoppade �ver\n"
 
-#: g10/import.c:1232
+#: g10/import.c:1528
 #, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "nyckel %08lX: �terkallelsecertifikat p� fel plats - hoppade �ver\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "nyckel %08lX: signatur p� undernyckel p� fel plats - hoppade �ver\n"
 
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade �ver\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "nyckel %08lX: anv�ndaridentitet hittades tv� g�nger - slog ihop\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr ""
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "VARNING: nyckeln %08lX kan ha sp�rrats: H�mtar sp�rrnyckel %08lX\n"
 
-#: g10/import.c:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr ""
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "VARNING: nyckeln %08lX kan ha sp�rrats: Sp�rrnyckeln %08lX saknas.\n"
 
-#: g10/import.c:1460
+#: g10/import.c:1770
 #, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "nyckel %08lX: lade till �terkallelsecertifikat\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "nyckel %08lX: lade till sp�rrcertifikat (revocation certificate)\n"
 
-#: g10/import.c:1491
+#: g10/import.c:1804
 #, fuzzy, c-format
-msgid "key %08lX: direct key signature added\n"
+msgid "key %s: direct key signature added\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
-msgstr "[�terkallelse]"
+msgstr "[sp�rrad]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
-msgstr "[sj�lvsignatur]"
+msgstr "[egensignatur]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "1 anv�ndaridentitet utan giltig sj�lvsignatur hittades\n"
+msgstr "1 anv�ndaridentitet utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "%d anv�ndaridentiteter utan giltig sj�lvsignatur hittades\n"
+msgstr "%d anv�ndaridentiteter utan giltig egensignatur hittades\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Jag litar maginellt p� denna anv�ndare\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:315
 #, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Jag litar fullst�ndigt p� denna anv�ndare\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "Nyckeln �r skyddad.\n"
+msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 #, 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:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
-msgstr ""
+msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:380
+#: g10/keyedit.c:519
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "VARNING: \"%s\" �r en tom fil\n"
+msgid "User ID \"%s\" is expired."
+msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
+
+#: g10/keyedit.c:545
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "VARNING: anv�ndar-ID \"%s\" saknar egensignatur.\n"
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
+"Egensignaturen p� \"%s\"\n"
+"�r en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Will du g�ra om den till en egensignatur av OpenPGP-typ? (j/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
 msgstr ""
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:611
+#, fuzzy
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"Vill du att giltighetstiden f�r signaturen ska upph�ra vid samma tid? (J/n) "
+
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr ""
+msgstr "Vill du �ndra den till en fullst�ndigt exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:657
 #, fuzzy, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
-msgstr "Redan signerad av nyckeln %08lX\n"
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:660
 #, fuzzy, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+msgid "\"%s\" was already signed by key %s\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+#, fuzzy
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:478
-#, fuzzy
+#: g10/keyedit.c:702
 msgid "This key has expired!"
-msgstr "Notera: Denna nyckel har g�tt ut!\n"
+msgstr "Notera: Giltighetstiden f�r denna nyckel har g�tt ut!"
 
-#: g10/keyedit.c:498
-#, fuzzy, c-format
+#: g10/keyedit.c:722
+#, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Denna nyckel �r inte skyddad.\n"
+msgstr "Denna nyckels giltighetstid g�r ut vid %s.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
+"Vill du att giltighetstiden f�r signaturen ska upph�ra vid samma tid? (J/n) "
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
+"Du kan inte g�ra en OpenPGP-signatur p� en PGP 2.x-nyckel n�r du �r i --pgp2-"
+"l�ge\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr ""
+msgstr "Detta skulle g�ra nyckeln oanv�ndbar i PGP 2.x.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 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 ""
+"Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillh�r\n"
+"personen som n�mns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
+"     (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr ""
+msgstr "     (1) Jag har inte kontrollerat identiteten alls.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr ""
+msgstr "     (2) Jag har gjort viss kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
+msgstr "     (3) Jag har gjort en noggrann kontroll av identiteten.%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2567,833 +2754,991 @@ msgstr ""
 "�r du verkligen s�ker p� att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
-msgstr "detta kan bero p� att det saknas en sj�lvsignatur\n"
+msgstr ""
+"\n"
+"Detta kommer att bli en egensignatur\n"
 
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
-"Signaturen kommer att markeras som icke exporterbar.\n"
+"\n"
+"VARNING: Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
-"Signaturen kommer att markeras som icke exporterbar.\n"
+"\n"
+"VARNING: Signaturen kommer att markeras som icke m�jlig att �terkalla.\n"
 "\n"
 
-#: g10/keyedit.c:620
-#, fuzzy
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
+"\n"
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:624
-#, fuzzy
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
-"Signaturen kommer att markeras som icke exporterbar.\n"
+"\n"
+"Signaturen kommer att markeras som icke m�jlig att �terkalla.\n"
 "\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
+"\n"
+"Jag har inte kontrollerat identiteten alls.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
+"\n"
+"Jag har gjort viss kontroll av identiteten.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
+"\n"
+"Jag har gjort en noggrann kontroll av identiteten.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 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:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Skriv in den nya l�senordsfrasen f�r denna hemliga nyckel.\n"
+"Skriv in den nya l�senmening f�r denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"Du vill inte ha n�gon l�senordsfras - detta �r sannolikt en d�lig id�!\n"
+"Du vill inte ha n�gon l�senmening - detta �r sannolikt en d�lig id�!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen g�ra detta? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
 msgstr "visa denna hj�lp"
 
 # skall dessa �vers�ttas?
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
 msgstr "r�kna upp nycklar och anv�ndaridentiteter"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
 msgstr "v�lj anv�ndaridentitet N"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
 msgstr "v�lj sekund�r nyckel N"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
 msgstr "r�kna upp signaturer"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "skapa en signatur i en separat fil"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:916
-#, fuzzy
+#: g10/keyedit.c:1154
 msgid "nrsign"
-msgstr "sign"
+msgstr "nrsign"
 
-#: g10/keyedit.c:916
-#, fuzzy
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
-msgstr "signera nyckeln lokalt"
+msgstr "signera nyckeln utan m�jlighet att �terkalla signaturen"
 
-#: g10/keyedit.c:917
-#, fuzzy
+#: g10/keyedit.c:1155
 msgid "nrlsign"
-msgstr "lsign"
+msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 #, fuzzy
 msgid "sign the key locally and non-revocably"
-msgstr "signera nyckeln lokalt"
+msgstr "signera nyckeln lokalt och utan m�jlighet att �terkalla signaturen"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
-msgstr ""
+msgstr "l�gg till bild"
 
-#: g10/keyedit.c:920
-#, fuzzy
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
-msgstr "l�gg till en anv�ndaridentitet"
+msgstr "l�gg till en anv�ndaridentitet med foto"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
 msgstr "ta bort en anv�ndaridentitet"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
-msgstr ""
+msgstr "ta bort bild"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
 msgstr "l�gg till en sekund�r nyckel"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
 msgstr "ta bort en sekund�r nyckel"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "addkey"
+msgstr "Ange sp�rrnyckel"
 
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "l�gg till en sekund�r nyckel"
+msgstr "l�gg till en sp�rrnyckel"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
 msgstr "�ndra utg�ngsdatum"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
-msgstr ""
+msgstr "prim�r"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
-msgstr ""
+msgstr "markera anv�ndar-ID:t som prim�rt"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
-msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
+msgstr "hoppa mellan utskrift av hemliga och offentliga (publika) nycklar"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:933
-#, fuzzy
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
-msgstr "skriv ut inst�llningar"
+msgstr "skriv ut inst�llningar (expertl�ge)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:934
-#, fuzzy
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
-msgstr "skriv ut inst�llningar"
+msgstr "skriv ut inst�llningar (utf�rligt)"
 
-#: g10/keyedit.c:935
-#, fuzzy
+#: g10/keyedit.c:1173
 msgid "setpref"
-msgstr "pref"
+msgstr "setpref"
 
-#: g10/keyedit.c:935
-#, fuzzy
+#: g10/keyedit.c:1173
 msgid "set preference list"
-msgstr "skriv ut inst�llningar"
+msgstr "ange inst�llningslista"
 
-#: g10/keyedit.c:936
-#, fuzzy
+#: g10/keyedit.c:1174
 msgid "updpref"
-msgstr "pref"
+msgstr "updpref"
 
-#: g10/keyedit.c:936
-#, fuzzy
+#: g10/keyedit.c:1174
 msgid "updated preferences"
-msgstr "skriv ut inst�llningar"
+msgstr "uppdaterat inst�llningar"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "nyckelserverfel"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
-msgstr "�ndra l�senordsfrasen"
+msgstr "�ndra l�senmening"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
 msgstr "�terkalla signaturer"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revuid"
+msgstr "revsig"
+
+#: g10/keyedit.c:1179
+#, fuzzy
+msgid "revoke a user ID"
+msgstr "l�gg till en anv�ndaridentitet"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
-msgstr "�terkalla en sekund�r nyckel"
+msgstr "sp�rra en sekund�r nyckel"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
-msgstr ""
+msgstr "visa bild"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
-msgstr ""
+msgstr "visa bild-ID"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
-msgstr "kan ej g�ra detta i batch-l�ge\n"
+msgstr "kan inte g�ra detta i batch-l�ge\n"
 
-#: g10/keyedit.c:1000
-#, fuzzy, c-format
+#: g10/keyedit.c:1233
+#, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "fel vid l�sning av \"%s\": %s\n"
+msgstr "fel vid l�sning av hemlig nyckel\"%s\": %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 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:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
 
-#: g10/keyedit.c:1134
-#, fuzzy
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
-msgstr "Nyckeln �r skyddad.\n"
+msgstr "Nyckeln �r sp�rrad."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr ""
+msgstr "Detta kommando �r inte till�tet n�r du �r i %s-l�ge.\n"
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
 msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+#, fuzzy
+msgid "Really revoke all selected user IDs? "
+msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
+
+#: g10/keyedit.c:1515
+#, fuzzy
+msgid "Really revoke this user ID? "
+msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
+
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
-msgstr "Vill du verkligen �terkalla de valda nycklarna? "
+msgstr "Vill du verkligen sp�rra de valda nycklarna? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
-msgstr "Vill du verkligen �terkalla denna nyckel? "
+msgstr "Vill du verkligen sp�rra denna nyckel? "
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
 #, fuzzy
+msgid "Set preference list to:\n"
+msgstr "ange inst�llningslista"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
+msgstr ""
+"Vill du verkligen �ndra inst�llningarna f�r alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
 msgstr "Spara �ndringarna? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 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:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
 
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr ""
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr ""
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
-msgstr "VARNING: Denna nyckel har �terkallats av sin �gare!\n"
+msgstr "VARNING: Denna nyckel har sp�rrats av sin �gare!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
-msgstr ""
+msgstr " (k�nsligt)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "revkey"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr "[g�r ut: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr "[g�r ut: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! en undernyckel har �terkallats: %s\n"
+msgstr "revoked! en undernyckel har sp�rrats: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
-msgstr "rev- hittade felaktig �terkallelse\n"
+msgstr "rev- hittade f�rfalskad sp�rr av nyckeln\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? problem vid kontroll av �terkallandet: %s\n"
+msgstr "rev? problem vid kontroll av sp�rren: %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
+"Du kan inte ange n�gra inst�llningar f�r ett anv�ndar-ID av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+#, fuzzy
+msgid "[revoked] "
+msgstr "revkey"
+
+#: g10/keyedit.c:2274
+#, fuzzy
+msgid "[expired] "
+msgstr "expire"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2399
 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:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 #, 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:2012
+#: g10/keyedit.c:2410
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr ""
+msgstr "Du kan inte l�gga till ett bild-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
-msgstr "Vill du radera denna sj�lvsignatur? (j/N)"
+msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
 # skulle lika g�rna kunna heta 1 signatur va?
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"VARNING: Detta �r en PGP 2-nyckel. Om du anger en sp�rrnyckel kan denna "
+"nyckel inte anv�ndas i vissa versioner av PGP.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Du f�r inte ange en sp�rrnyckel f�r en PGP 2-nyckel.\n"
+
+#: g10/keyedit.c:2703
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Ange storleken p� nyckeln"
+msgstr "Ange ID f�r �nskad sp�rrnyckel"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
+msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "VARNING: Denna nyckel har sp�rrats av sin �gare!\n"
+
+#: g10/keyedit.c:2782
+#, fuzzy
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+#, fuzzy
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
+
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
 msgstr "V�lj som mest en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen anv�ndaridentitet med index %d\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r nyckel med index %d\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
 msgstr "anv�ndaridentitet: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:2918
+#: g10/keyedit.c:3499
 #, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
-"signerad med din nyckel %08lX %s\n"
+"lokalt signerad med din nyckel %08lX vid %s\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/keyedit.c:2927
-#, fuzzy
+#: g10/keyedit.c:3508
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "Vill du verkligen �terkalla denna nyckel? "
+msgstr "Vill du verkligen sp�rra denna nyckel? "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "Vill du skapa ett �terkallelsecertifikat f�r denna signatur? (j/N)"
+msgstr ""
+"Vill du skapa ett sp�rrcertifikat (revocation certificate) f�r denna "
+"signatur? (j/N)"
 
-#. FIXME: detect duplicates here
-#: g10/keyedit.c:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
 
-#: g10/keyedit.c:2975
+#: g10/keyedit.c:3558
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s%s\n"
+msgid "   signed by %s on %s%s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:2983
-#, c-format
-msgid "   revoked by %08lX at %s\n"
-msgstr "   �terkallad av %08lX %s\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   sp�rrad av %08lX %s\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:3013
+#: g10/keyedit.c:3597
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %s on %s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
-msgstr ""
+msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
+msgstr "Vill du verkligen skapa sp�rrcertifikaten? (j/N)"
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, fuzzy, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr ""
+
+#: g10/keyedit.c:3892
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
 
-#: g10/keylist.c:91
+#: g10/keylist.c:179
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/keylist.c:127
+#: g10/keylist.c:286
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Notation: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Notation: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
-msgstr ""
+msgstr "inte m�jlig att l�sa f�r m�nniskor"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
-msgstr ""
+msgstr "Nyckelring"
+
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr "[g�r ut: %s]"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr "[g�r ut: %s]"
 
-#: g10/keylist.c:1001
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "revkey"
+
+#: g10/keylist.c:1357
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/keylist.c:1003
+#: g10/keylist.c:1359
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#: g10/keylist.c:1010
+#: g10/keylist.c:1366
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#: g10/keylist.c:1012
+#: g10/keylist.c:1368
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
+#: g10/keylist.c:1372 g10/keylist.c:1376
 #, fuzzy
-msgid "     Key fingerprint ="
+msgid "      Key fingerprint ="
 msgstr "           Fingeravtryck:"
 
 #: g10/mainproc.c:248
@@ -3401,25 +3746,35 @@ msgstr "           Fingeravtryck:"
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:258
+#: g10/mainproc.c:262
 #, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "felaktig hash-algoritm \"%s\"\n"
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "ok�nd krypteringsalgoritm"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s krypterad data\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en ok�nd algoritm %d\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
-msgstr "den publika nyckeln �r %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "krypterad med en ok�nd algoritm %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "den offentliga (publika) nyckeln �r %08lX\n"
 
 # DEK betyder Data Encryption Key, Meddelandet �r f�rvirrande
 # men efter att ha kikat i koden har jag kommit fram till att
@@ -3428,517 +3783,620 @@ 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:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
+msgstr ""
+"data krypterad med offentlig (publik) nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "dekryptering med publik nyckel misslyckades: %s\n"
+msgstr "dekryptering med offentlig (publik) nyckel misslyckades: %s\n"
+
+#: g10/mainproc.c:500
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "Repetera l�senordsfrasen\n"
+
+#: g10/mainproc.c:502
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "Repetera l�senordsfrasen\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
+"IDEA-kryptering inte installerad. Optimistiskt f�rs�k att anv�nda %s "
+"ist�llet\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+#, fuzzy
+msgid "WARNING: message was not integrity protected\n"
+msgstr "VARNING: exporterade ingenting\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har �ndrats!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBSERVERA: avs�ndaren efterfr�gade \"endast-f�r-dina-�gon\"\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
-"frist�ende �terkallelsecertifikat - anv�nd \"gpg --import\" f�r\n"
+"frist�ende sp�rrcertifikat - anv�nd \"gpg --import\" f�r\n"
 "att applicera\n"
 
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "Notation: "
-
-# finns det n�gon bra svensk �vers�ttning av policy?
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "Policy: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "%s-signatur fr�n: %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "      �ven k�nd som \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signerades %.*s med hj�lp av %s-nyckeln med ID %08lX\n"
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+#, fuzzy
+msgid "Key available at: "
+msgstr "Det finns ingen hj�lp tillg�nglig"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur fr�n \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
-#, fuzzy
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
-msgstr "Korrekt signatur fr�n \""
+msgstr "Giltighetstiden har upph�rt f�r signatur fr�n \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
 msgstr "Korrekt signatur fr�n \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
-msgstr ""
+msgstr "[os�kert]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "      �ven k�nd som \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, fuzzy, c-format
+msgid "Signature expired %s\n"
+msgstr "%s-signatur fr�n: %s\n"
+
+#: g10/mainproc.c:1643
+#, fuzzy, c-format
+msgid "Signature expires %s\n"
+msgstr "%s-signatur fr�n: %s\n"
+
+#: g10/mainproc.c:1646
+#, fuzzy, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s-signatur fr�n: %s\n"
+
+#: g10/mainproc.c:1647
+#, fuzzy
+msgid "binary"
+msgstr "prim�r"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr ""
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+#, fuzzy
+msgid "unknown"
+msgstr "ok�nd version"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
 msgstr "ingen frikopplad signatur\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr ""
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "frist�ende signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte deaktivera minnesutskrifter: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentella algoritmer b�r inte anv�ndas!\n"
 
 # XXX
-#: g10/misc.c:192
+#: g10/misc.c:176
 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"
+"denna krypteringsalgoritm �r f�rlegad, anv�nd ist�llet en mer normal "
+"algoritm!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
-msgstr ""
+msgstr "Insticksprogram f�r IDEA-kryptering �r inte installerat\n"
 
-#: g10/misc.c:301
+#: g10/misc.c:283
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr ""
+msgstr "Mer information finns p�: http://www.gnupg.org/why-not-idea.html\n"
 
-#: g10/misc.c:509
+#: g10/misc.c:491
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "VARNING: \"%s\" �r en tom fil\n"
+msgstr "VARNING: %s �r en f�rlegad flagga\n"
 
-#: g10/misc.c:513
+#: g10/misc.c:495
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VARNING: \"%s\" �r en tom fil\n"
+msgstr "VARNING: %s �r en f�rlegad flagga\n"
 
-#: g10/misc.c:515
-#, c-format
+#: g10/misc.c:497
+#, fuzzy, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr ""
+msgstr "anv�nd \"--keyserver-options %s\" ist�llet\n"
+
+#: g10/misc.c:508
+#, fuzzy
+msgid "Uncompressed"
+msgstr "inte behandlade"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "inte behandlade"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "detta meddelande kanske inte kan anv�ndas av %s\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "l�ser flaggor fr�n \"%s\"\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "den f�rvalda mottagaren \"%s\" �r ok�nd\n"
 
 #: 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"
+msgstr "kan inte hantera algoritm %d f�r offentlig (publik) nyckelhantering\n"
 
-#: g10/parse-packet.c:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1128
 #, 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"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte f� tillg�ng till n�gon gpg-agent i denna session\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "milj�variabeln GPG_AGENT_INFO �r felformaterad\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "skyddsalgoritmen %d st�ds inte\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "problem vid kommunikation med GPG-Agent\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 #, fuzzy
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med agenten: agenten returnerar 0x%lx\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
-"Du beh�ver en l�senordsfras f�r att l�sa upp den hemliga nyckeln f�r\n"
+"Du beh�ver en l�senmening f�r att l�sa upp den hemliga nyckeln f�r\n"
 "anv�ndaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Ange l�senordsfras\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
 msgstr "Repetera l�senordsfrasen\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Ange l�senmening\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
-msgstr "l�senordsfrasen �r f�r l�ng\n"
+msgstr "l�senmeningen �r f�r l�ng\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
 msgstr "felaktigt svar fr�n agenten\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
 msgstr "avbruten av anv�ndaren\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem med agenten: agenten returnerar 0x%lx\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "kan inte fr�ga efter l�senmening i batch-l�ge\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Ange l�senmening: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 "\n"
-"Du beh�ver en l�senordsfras f�r att l�sa upp den hemliga nyckeln f�r\n"
+"Du beh�ver en l�senmening f�r att l�sa upp den hemliga nyckeln f�r\n"
 "anv�ndaren: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "kan inte fr�ga efter l�senord i batch-l�ge\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Ange l�senordsfras: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
-msgstr "Repetera l�senordsfrasen: "
+msgstr "Repetera l�senmeningen: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, anv�nd flaggan \"--output\" f�r att spara den\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
 msgstr "L�skopplad signatur.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
 msgstr "Ange namnet p� datafilen: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "l�ser fr�n standard in ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte �ppna signerad data \"%s\"\n"
 
-#: g10/pubkey-enc.c:101
+#: g10/pubkey-enc.c:103
 #, fuzzy, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
+msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare, f�rs�ker anv�nda den hemliga nyckeln %08lX ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi �r den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln st�ds inte\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "chifferalgoritmen %d �r ok�nd eller avslagen\n"
+msgstr "krypteringsalgoritmen %d �r ok�nd eller avst�ngd\n"
 
-#: 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:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "OBSERVERA: krypteringsalgoritmen %d finns inte i inst�llningarna\n"
 
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBSERVERA: den hemliga nyckeln %08lX gick ut %s\n"
 
-#: g10/pubkey-enc.c:249
+#: g10/pubkey-enc.c:292
 #, fuzzy
 msgid "NOTE: key has been revoked"
-msgstr "nyckeln %08lX: nyckeln har �terkallats!\n"
-
-#: g10/hkp.c:71
-#, fuzzy, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "fr�ga efter nyckeln %08lX fr�n %s ...\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "kan inte h�mta nyckeln fr�n en nyckelserver: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "fel vid s�ndning till \"%s\": %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "lyckades s�nda till \"%s\" (status=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "misslyckades s�nda till \"%s\": status=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
-
-#: g10/hkp.c:565
-#, fuzzy, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "kan inte h�mta nyckeln fr�n en nyckelserver: %s\n"
+msgstr "nyckeln %08lX: nyckeln har sp�rrats!\n"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna �r inte tillg�nliga\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, fuzzy, c-format
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d st�ds inte\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "skyddsalgoritmen %d st�ds inte\n"
+
+#: g10/seckey-cert.c:250
 #, fuzzy
 msgid "Invalid passphrase; please try again"
-msgstr "Ogiltig l�senordsfras, f�rs�k igen ...\n"
+msgstr "Ogiltig l�senmening, f�rs�k igen ...\n"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
 # �r det nyckeln som �r svag, konstigt
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "VARNING: Uppt�ckte en svag nyckel - byt l�senordsfras igen.\n"
+msgstr "VARNING: Uppt�ckte en svag nyckel - byt l�senmening igen.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
 msgstr ""
 
-#: g10/sig-check.c:215
-#, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
-"detta �r en PGP-genererad ElGamal-nyckel som INTE �r s�ker f�r signaturer!\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
 
 # beh�vs verkligen c-format h�r?
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
 #, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "den publika nyckeln �r %lu sekund nyare �n signaturen\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr ""
+"den offentliga (publika) nyckeln %08lX �r %lu sekund nyare �n signaturen\n"
 
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
 #, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "den publika nyckeln �r %lu sekunder nyare �n signaturen\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr ""
+"den offentlig (publik) nyckeln %08lX �r %lu sekunder nyare �n signaturen\n"
 
 # c-format beh�vs inte i singularis
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln �r skapad %lu sekund in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
 #, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
 "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %08lX, gick ut vid %s\n"
 
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
 #, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgid "assuming bad signature from key %s 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:103
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "nyckel %08lX: ingen undernyckel f�r sp�rr av undernyckel\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
+
+#: g10/sign.c:85
+#, fuzzy
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
+
+#: g10/sign.c:93
+#, fuzzy
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
+
+#: g10/sign.c:112
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:151
+#: g10/sign.c:138
+#, fuzzy
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr ""
+
+#: g10/sign.c:159
 #, c-format
 msgid ""
-"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:303
+#: g10/sign.c:187
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr ""
+
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "f�rs�k att verifiera signaturen misslyckades: %s\n"
 
-#: g10/sign.c:312
+#: g10/sign.c:373
 #, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
+msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" �r en tom fil\n"
 
-#: g10/sign.c:644
+#: g10/sign.c:741
+#, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"du kan bara skapa fr�nkopplade signaturereller klartextsignaturer\n"
+"tillsammans med --pgp2\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/sign.c:690
+#: g10/sign.c:794
 #, 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
+#: g10/sign.c:886
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1029
+#: g10/sign.c:1138
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "dekrypteringen misslyckades: %s\n"
@@ -3953,12 +4411,12 @@ msgstr "kan inte hantera text med rader l�ngre �n %d tecken\n"
 msgid "input line longer than %d characters\n"
 msgstr "indataraden �r l�ngre �n %d tecken\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
@@ -3967,199 +4425,275 @@ msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion f�r stor\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ingen �tkomst: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: kan inte skapa l�s\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, fuzzy, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: kan inte skapa l�s\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan inte skapa: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: felaktig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "OBS: det g�r inte att skriva till tillitsdatabasen\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: felaktig tillitsdatabas\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa hash-tabell: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid l�sning av versionspost: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: l�sning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: ej en tillitsdatabasfil\n"
+msgstr "%s: detta �r inte en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid l�sning av ledig post: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid l�sning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollst�lla en post: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att l�gga till en post: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen �r trasig, k�r \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" �r en ogiltig l�ng nyckelidentitet\n"
 
-#: g10/trustdb.c:235
+#: g10/trustdb.c:257
 #, fuzzy, c-format
-msgid "key %08lX: accepted as trusted key\n"
+msgid "key %s: accepted as trusted key\n"
 msgstr "nyckel %08lX: accepterad som en p�litlig nyckel\n"
 
-#: g10/trustdb.c:274
+#: g10/trustdb.c:295
 #, fuzzy, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nyckel %08lX: kan inte l�gga till i tillitsdatabasen\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "nyckel %08lX: hittade ingen motsvarande publik nyckel - �verhoppad\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr ""
+"nyckel %08lX: hittade ingen motsvarande offentlig (publik) nyckel - "
+"�verhoppad\n"
+
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "Nyckeln har ultimat f�rtroende (som din egen nyckel).\n"
 
 # req �r nog felstavat i originalet d� det syftar p� record och inte
 # request
-#: g10/trustdb.c:332
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, posttyp %d: kunde inte l�sa: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitspost %lu: kunde inte radera: %s\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+msgid "never"
+msgstr ""
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
 #, fuzzy
 msgid "no need for a trustdb check\n"
-msgstr "%s: ej en tillitsdatabasfil\n"
+msgstr "%s: det beh�vs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "%s: det beh�vs ingen kontroll av tillitsdatabasen\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "%s: det beh�vs ingen kontroll av tillitsdatabasen\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "hittade inte den offentliga (publika) nyckeln %08lX :%s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr ""
+
 # originalet borde ha ett value
-#: g10/trustdb.c:779
+#: g10/trustdb.c:991
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr ""
+
+#: g10/trustdb.c:1911
+#, fuzzy
+msgid "no ultimately trusted keys found\n"
+msgstr ""
+"Hittar inte den offentliga (publika) nyckeln tillh�rande den ultimat "
+"betrodda nyckeln %08lX \n"
+
+#: g10/trustdb.c:1925
 #, fuzzy, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "hittade inte publik nyckel"
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr ""
+"Hittar inte den offentliga (publika) nyckeln tillh�rande den ultimat "
+"betrodda nyckeln %08lX \n"
 
-#: g10/trustdb.c:1515
+#: g10/trustdb.c:1948
 #, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -4169,7 +4703,7 @@ msgstr ""
 "Kom ih�g att signaturfilen (.sig eller .asc)\n"
 "ska vara den f�rst angivna filen p� kommandoraden\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u �r f�r l�ng, eller saknar nyradstecken\n"
@@ -4195,15 +4729,14 @@ msgid "skipped: secret key already present\n"
 msgstr "hoppade �ver: hemlig nyckel finns redan\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
 "hoppade �ver \"%s\": detta �r en nyckel av ElGamal-typ genererad av PGP\n"
 "som inte �r s�ker f�r signaturer!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
@@ -4222,26 +4755,31 @@ msgstr "%s: ok�nt suffix\n"
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signera data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:326
+#: g10/openfile.c:349
 #, fuzzy, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "%s: ny inst�llningsfil skapad\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog skapad\n"
@@ -4250,8 +4788,8 @@ msgstr "%s: katalog skapad\n"
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"VARNING: meddelandet krypterades med en svag nyckel i det symmetriska\n"
-"chiffret.\n"
+"VARNING: meddelandet krypterades med en svag nyckel i den symmetriska\n"
+"krypteringen.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
@@ -4265,49 +4803,51 @@ msgstr "skapade en svag nyckel - f�rs�ker igen\n"
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"kan inte undvika en svag nyckel f�r symmetriskt chiffer; f�rs�kte\n"
+"kan inte undvika en svag nyckel f�r symmetrisk kryptering; f�rs�kte\n"
 "%d g�nger!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr ""
+msgstr "DSA kr�ver att du anv�nder en 160-bitars hash-algoritm\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(om du inte anger nyckeln med hj�lp av fingeravtrycket)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan inte g�ra s� i batch-l�ge utan flaggan \"--yes\"\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Vill du ta bort denna nyckel fr�n nyckelringen? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
 msgstr "Detta �r en hemlig nyckel! - vill du verkligen ta bort den? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, fuzzy, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "numrering av nyckelblock misslyckades: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
 msgstr ""
 
-#: g10/delkey.c:206
-#, fuzzy, c-format
+#: g10/delkey.c:195
+#, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "det finns en hemlig nyckel tillh�rande denna publika nyckel!\n"
+msgstr ""
+"det finns en hemlig nyckel tillh�rande denna offentliga (publika) nyckel!\"%s"
+"\"!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "anv�nd flaggan \"--delete-secret-key\" f�r att ta bort den f�rst.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
@@ -4318,7 +4858,7 @@ msgstr ""
 "\"n�tet av tillit\". Det har inget att g�ra med det (implicit skapade)\n"
 "n�tet av certifikat."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
@@ -4326,86 +4866,50 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
-msgstr "Om du vill anv�nda denna �terkallade nyckel �nd�, svara \"ja\"."
+msgstr "Om du vill anv�nda denna sp�rrade nyckel �nd�, svara \"ja\"."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Om du vill anv�nda denna otillf�rlitliga nyckel �nd�, svara \"ja\"."
 
-#: g10/helptext.c:68
+#: g10/helptext.c:69
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Ange anv�ndaridentiteten till vilken du vill skicka meddelandet."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"V�lj vilken algoritm du vill anv�nda.\n"
-"\n"
-"DSA (�ven k�nd som DSS) �r den algoritm f�r digitala signaturer som bara\n"
-"kan anv�ndas f�r just signaturer. Detta �r den rekommenderade algoritmen\n"
-"eftersom verifiering av DSA-signaturer �r mycket snabbare �n\n"
-"ElGamal-signaturer.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"ElGamal �r en algoritm som kan anv�ndas f�r signaturer och kryptering.\n"
-"OpenPGP-standarden skiljer p� tv� varianter av denna algoritm: en som bara\n"
-"kan anv�ndas f�r kryptering och en som b�de kan signera och kryptera.\n"
-"Egentligen �r det samma algoritm, men vissa parametrar m�ste v�ljas p�\n"
-"ett speciellt s�tt f�r att skapa en s�ker nyckel f�r signaturer: detta "
-"program\n"
-"g�r detta men andra OpenPGP-implementationer beh�ver inte f�rst�\n"
-"signatur+kryptering varianten.\n"
-"\n"
-"Den f�rsta (prim�ra) nyckeln m�ste alltid vara en nyckel som kan anv�ndas\n"
-"f�r att skapa signaturer. Detta �r anledningen till att den ElGamal-variant\n"
-"som bara krypterar inte �r tillg�nglig i denna meny"
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Trots att dessa nycklar �r definierade i RFC2440 �r det inte rekommenderat\n"
-"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:98
+#: g10/helptext.c:87
 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
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
 msgstr "Ange storleken p� nyckeln"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
 msgstr "Svara \"ja\" eller \"nej\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
@@ -4417,19 +4921,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:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Ange namnet p� nyckelns �gare"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 msgid "please enter an optional but highly suggested email address"
 msgstr "ange en epostadress. Detta �r valfritt men rekommenderas varmt"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
 msgstr "Ange en valfri kommentar"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4443,11 +4947,11 @@ msgstr ""
 "O  f�r att forts�tta med nyckelgenerering.\n"
 "Q  f�r att avsluta nyckelgenereringen."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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:162
+#: g10/helptext.c:151
 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"
@@ -4487,13 +4991,53 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
+"N�r du signerar ett anv�ndar-ID p� en nyckel, m�ste du f�rst kontrollera att "
+"nyckeln\n"
+"verkligen tillh�r den person som n�mns i anv�ndar-ID:t.  Det �r viktigt f�r "
+"andra att\n"
+"f� veta hur noga du har kontrollerat detta.\n"
+"\n"
+"\"0\" betyder att du inte p�st�r n�gonting om hur noga du "
+"kontrolleratnyckeln.\n"
+"\n"
+"\"1\" betyder att du tror att nyckeln tillh�r den person som p�st�r sig g�ra "
+"det\n"
+"    men du kunde inte, eller ville inte kontrollera nyckeln alls.  Detta �r "
+"anv�ndbartf�r\n"
+"    en \"persona\" kontroll, d�r du signerar nyckeln f�r en anv�ndare med "
+"pseudonym.\n"
+"\n"
+"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda "
+"att\n"
+"    du kontrollerade fingeravtrycket och kontrollerade anv�ndar-ID:t f�r "
+"nyckeln\n"
+"    mot en fotolegitimation.\n"
+"\n"
+"\"3\" betyder att du gjorde en noggrann och utt�mmande kontroll av nyckeln.  "
+"Detta kan t.ex.\n"
+"    betyda att du kontrollerade nyckelns fingeravtryck direkt med "
+"nyckelinnehavaren\n"
+"    och att du kontrollerade, med hj�lp av sv�rf�rfalskade "
+"identitetsdokument\n"
+"a\n"
+"    med foto (tex ett k�rkort) att namnet p� innehavaren st�mmer med\n"
+"    namnet i anv�ndar-ID:t p� nyckeln, och slutligen att du kontrollerade att"
+"(genom att utv�xla\n"
+"    e-postmeddelanden) att e-postadressen p� nyckeln tillh�r "
+"nyckelinnehavaren.\n"
+"\n"
+"Obs! Ovanst�ende exempel f�r niv�erna 2 och 3 �r bara f�rslag.\n"
+"Slutligen �r det bara du sj�lv som avg�r vad \"viss\" and \"noggrann\"\n"
+"betyder n�r du signerar andras nycklar.\n"
+"\n"
+"Om du inte vet vad du ska svara, s� svara \"0\"."
 
-# felstavat original
-#: g10/helptext.c:200
+# felstavat original meddelat till Werner.
+#: g10/helptext.c:189
 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:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
@@ -4501,11 +5045,11 @@ msgstr ""
 "Svara \"ja\" om du verkligen vill ta bort denna anv�ndaridentitet.\n"
 "Alla certifikat kommer att g� f�rlorade!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
 msgstr "Svara \"ja\" om du vill ta bort denna undernyckel"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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"
@@ -4516,7 +5060,7 @@ msgstr ""
 "en tillitskoppling till nyckeln eller en annan nyckel som �r\n"
 "certifierad av denna nyckel."
 
-#: g10/helptext.c:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
@@ -4528,7 +5072,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:225
+#: g10/helptext.c:214
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
@@ -4537,7 +5081,7 @@ msgstr ""
 "din nyckelring."
 
 # borde inge GnuPG bytas ut mot gpg eller �nnu b�ttre %s?
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4548,38 +5092,39 @@ msgstr ""
 "Detta �r en signatur som knyter anv�ndaridentiteten till denna nyckel.\n"
 "Det �r oftast inte en bra id� att ta bort en s�dan signatur. Till\n"
 "och med kan det bli s� att GnuPG kanske inte kan anv�nda denna nyckel\n"
-"mer. S� g�r bara detta om denna sj�lvsignatur av n�gon anledning �r\n"
+"mer. S� g�r bara detta om denna egensignatur av n�gon anledning �r\n"
 "ogiltig och det finns en andra signatur som tillg�nglig."
 
-#: g10/helptext.c:237
+#: g10/helptext.c:226
 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 ""
+"�ndra dina inst�llningar f�r alla anv�ndar-ID:n (eller enbart f�r en av de "
+"valda)\n"
+"till den aktuella listan p� inst�llningar. Tidsst�mplingen f�r alla "
+"p�verkade\n"
+"egensignaturer kommer att flyttas fram en sekund.\n"
 
-# ej klar, eller?
-#: g10/helptext.c:244
-#, fuzzy
+#: g10/helptext.c:233
 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]"
+msgstr "Ange en l�senmening. Detta �r en hemlig mening\n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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."
+msgstr "Reptera l�senmeningen, s� du �r s�ker p� vad du skrev in."
 
 # # felstavat/ologiskt original
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet p� den fil signaturen g�ller"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om det du vill skriva �ver filen"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -4587,7 +5132,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att anv�ndas."
 
-#: g10/helptext.c:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4617,371 +5162,664 @@ msgstr ""
 "     skall anv�ndas. Detta anv�nds normalt f�r att visa att en epostadress\n"
 "     �r ogiltig.\n"
 
-#: g10/helptext.c:286
+#: g10/helptext.c:275
 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 ""
 "Om du vill kan du ange en text som beskriver varf�r du utf�rdar\n"
-"detta �terkallelsecertifikat. F�rs�k att h�lla texten kort och koncis.\n"
+"detta sp�rrcertifikat (revocation certificate). F�rs�k att h�lla texten kort "
+"och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: g10/helptext.c:301
+#: g10/helptext.c:290
 msgid "No help available"
 msgstr "Det finns ingen hj�lp tillg�nglig"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hj�lp tillg�nglig f�r \"%s\""
 
-#: g10/keydb.c:178
-#, fuzzy, c-format
+#: g10/keydb.c:189
+#, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: g10/keydb.c:185
-#, fuzzy, c-format
+#: g10/keydb.c:196
+#, c-format
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:575
-#, fuzzy, c-format
+#: g10/keydb.c:615
+#, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "%s: misslyckades med att skapa hash-tabell: %s\n"
+msgstr "misslyckades med att �terskapa nyckelringscache: %s\n"
 
 # m�rkligt felmeddelande, kolla upp
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s �r den of�r�ndrade\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s �r den nya\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
 msgstr "L�s detta potentiella s�kerhetsproblem\n"
 
-#: g10/keyring.c:1346
+#: g10/keyring.c:1360
 #, fuzzy, c-format
-msgid "checking keyring `%s'\n"
-msgstr "kan inte l�sa nyckelringen \"%s\": %s\n"
+msgid "caching keyring `%s'\n"
+msgstr "kontrollerar nyckelringen `%s'\n"
 
-#: g10/keyring.c:1377
+#: g10/keyring.c:1406
 #, fuzzy, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "har behandlat %lu nycklar hittills\n"
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 
-#: g10/keyring.c:1388
+#: g10/keyring.c:1418
 #, fuzzy, c-format
-msgid "%lu keys checked (%lu signatures)\n"
-msgstr "r�kna upp nycklar och signaturer"
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-# GnuPG borde v�l ers�ttas med %s?
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr ""
+
+#: g10/photoid.c:87
+#, fuzzy, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
+
+#: g10/photoid.c:97
 #, fuzzy
-#~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
-#~ msgstr ""
-#~ "du m�ste starta om GnuPG, s� att den nya inst�llningsfilen kan l�sas\n"
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#~ msgid "Fingerprint:"
-#~ msgstr "Fingeravtryck:"
+#: g10/photoid.c:112
+#, fuzzy, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "%s: detta �r inte en tillitsdatabasfil\n"
 
-#~ msgid "             Fingerprint:"
-#~ msgstr "           Fingeravtryck:"
+#: g10/photoid.c:129
+#, fuzzy
+msgid "Is this photo correct (y/N/q)? "
+msgstr "St�mmer detta (j/n)? "
 
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
+#: g10/photoid.c:331
+#, fuzzy
+msgid "unable to display photo ID!\n"
+msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
 
-#~ 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/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr ""
 
-#~ 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/exec.c:184
+#, fuzzy, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "%s: kan inte skapa katalog: %s\n"
 
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+
+#: g10/exec.c:432
+#, fuzzy, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
+
+#: g10/exec.c:513
+#, fuzzy, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "%s: fel vid l�sning av versionspost: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr ""
+
+#: g10/exec.c:539
 #, fuzzy
-#~ msgid "Are you sure you still want to sign it?\n"
-#~ msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
+msgid "unable to execute external program\n"
+msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
 
+#: g10/exec.c:548
+#, fuzzy, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr ""
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr ""
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr ""
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, fuzzy, c-format
+msgid "build_packet failed: %s\n"
+msgstr "uppdateringen misslyckades: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr ""
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr ""
+
+#: g10/revoke.c:279 g10/revoke.c:476
 #, fuzzy
-#~ msgid "  Are you sure you still want to sign it?\n"
-#~ msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
+msgid "Create a revocation certificate for this key? "
+msgstr ""
+"Vill du skapa ett sp�rrcertifikat (revocation certificate) f�r denna "
+"signatur? (j/N)"
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr ""
 
+#: g10/revoke.c:306 g10/revoke.c:521
+#, fuzzy, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "misslyckades med att uppdatera hemligheten: %s\n"
+
+#: g10/revoke.c:369
 #, fuzzy
-#~ msgid "Really sign? (y/N) "
-#~ msgstr "Vill du verkligen signera? "
+msgid "Revocation certificate created.\n"
+msgstr "nyckel %08lX: lade till sp�rrcertifikat (revocation certificate)\n"
 
-#~ msgid "too many random bits requested; the limit is %d\n"
-#~ msgstr "f�r m�nga slumpm�ssiga bitar efterfr�gades; maximalt antal �r %d\n"
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr ""
 
-#~ msgid "|[NAMES]|check the trust database"
-#~ msgstr "|[NAMN]|kontrollera tillitsdatabasen"
+#: g10/revoke.c:429
+#, fuzzy, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
 
-#~ msgid "--delete-secret-key user-id"
-#~ msgstr "--delete-secret-key anv�ndaridentitet"
+#: g10/revoke.c:458
+#, fuzzy, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "skriver offentlig (publik) nyckel till \"%s\"\n"
 
-#~ msgid "--delete-key user-id"
-#~ msgstr "--delete-key anv�ndaridentitet"
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr ""
 
-#~ msgid "--delete-secret-and-public-key user-id"
-#~ msgstr "--delete-secret-and-public-key anv�ndaridentitet"
+#: g10/revoke.c:492
+#, fuzzy
+msgid "unknown protection algorithm\n"
+msgstr "ok�nd komprimeringsalgoritm"
 
-#~ msgid "For info see http://www.gnupg.org"
-#~ msgstr "F�r information se http://www.gnupg.org/"
+#: g10/revoke.c:496
+#, fuzzy
+msgid "NOTE: This key is not protected!\n"
+msgstr "Denna nyckel �r inte skyddad.\n"
 
-# v�rdena st�r f�r s = show me more info,  m = back to menu, q = quit
-# hur skall s�dant internationaliseras p� ett bra s�tt?
-#~ msgid "sSmMqQ"
-#~ msgstr "sSmMqQ"
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
 
-#~ 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 ""
-#~ "Kunde inte hitta n�gon giltig tillitsv�g till nyckeln. L�t oss se om vi "
-#~ "kan\n"
-#~ "tilldela n�gra av de �gartillitsv�rden som saknas\n"
-#~ "\n"
+#: g10/revoke.c:588
+#, fuzzy
+msgid "Please select the reason for the revocation:\n"
+msgstr "Anledning till sp�rren: "
 
-#~ msgid ""
-#~ "No path leading to one of our keys found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "En av de funna nycklarna saknar tillitsv�g.\n"
-#~ "\n"
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr ""
 
-#~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Hittade inga certifikat med odefinierat tillitv�rde\n"
-#~ "\n"
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "No trust values changed.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Inga tillitsv�rden �ndrade.\n"
-#~ "\n"
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
 
-#~ msgid "%08lX: no info to calculate a trust probability\n"
-#~ msgstr ""
-#~ "%08lX: det finns ingen information f�r att ber�kna ett tillitv�rde\n"
+#: g10/revoke.c:669
+#, fuzzy, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Anledning till sp�rren: "
 
-#~ msgid "Enter the user ID: "
-#~ msgstr "Ange anv�ndaridentiteten: "
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr ""
 
-#~ msgid "skipped: public key already set with --encrypt-to\n"
-#~ msgstr "hoppade �ver: publik nyckel �r redan angiven med --encrypt-to\n"
+#: g10/revoke.c:676
+#, fuzzy
+msgid "Is this okay? "
+msgstr "Vill du anv�nda nyckeln trots det? "
 
-#~ msgid "%s: error checking key: %s\n"
-#~ msgstr "%s: fel vid kontroll av nyckeln: %s\n"
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
 
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr "Vill du verkligen skapa en nyckel f�r signering och kryptering? "
+# Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
+# fixa en patch?
+#: g10/tdbdump.c:140
+#, fuzzy, c-format
+msgid "can't open file: %s\n"
+msgstr "kan inte �ppna %s: %s\n"
 
-#~ msgid "Do you really need such a large keysize? "
-#~ msgstr "Beh�ver du verkligen en s� stor nyckelstorlek? "
+#: g10/tdbdump.c:151
+#, fuzzy
+msgid "line too long\n"
+msgstr "l�senmeningen �r f�r l�ng\n"
 
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: hittade inte anv�ndaren: %s\n"
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr ""
 
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "fel vid l�sning av certifikat: %s\n"
+#: g10/tdbdump.c:164
+#, fuzzy
+msgid "error: invalid fingerprint\n"
+msgstr "%s: ogiltig filversion %d\n"
 
-#~ msgid "too many entries in unk cache - disabled\n"
-#~ msgstr "f�r m�nga poster i unk-cachen - inaktiverad\n"
+#: g10/tdbdump.c:168
+#, fuzzy
+msgid "error: no ownertrust value\n"
+msgstr "exportera de v�rden som representerar �gartillit"
 
-#~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
-#~ msgstr ""
-#~ "den hemliga nyckeln %08lX importerades inte (anv�nd %s f�r att till�ta)\n"
+#: g10/tdbdump.c:204
+#, fuzzy, c-format
+msgid "error finding trust record: %s\n"
+msgstr "%s: fel vid l�sning av katalogpost: %s\n"
 
-#~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "nyckel %08lX: v�r kopia har ingen sj�lvsignatur\n"
+#: g10/tdbdump.c:208
+#, fuzzy, c-format
+msgid "read error: %s\n"
+msgstr "skal: %s\n"
 
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: hittade inte anv�ndaren\n"
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[filer]|kryptera filer"
 
-#~ msgid "update of trustdb failed: %s\n"
-#~ msgstr "uppdateringen av tillitsdatabasen misslyckades: %s\n"
+#~ msgid "store only"
+#~ msgstr "endast lagring"
 
-#~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr "k�nner inte till n�gon nyckelserver (anv�nd flaggan --keyserver)\n"
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[files]|dekryptera filer"
 
-#~ msgid "%s: not a valid key ID\n"
-#~ msgstr "%s: ogiltig nyckelidentitet\n"
+#~ msgid "sign a key non-revocably"
+#~ msgstr "signera en nyckel utan m�jlighet till �terkallelse"
 
-#~ msgid "assuming bad MDC due to an unknown critical bit\n"
-#~ msgstr "antar att MDC �r felaktig eftersom en ok�nd kritisk bit �r satt\n"
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "signera en nyckel lokalt utan m�jlighet till �terkallelse"
 
-# LID betyder local id och �r serienumret i den lokala databasen
-# f�r en given nyckel
-#~ msgid "error reading dir record for LID %lu: %s\n"
-#~ msgstr "fel vid l�sning av katalogpost f�r lokalt id %lu: %s\n"
+#~ msgid "list only the sequence of packets"
+#~ msgstr "skriv endast ut paketsekvensen"
 
-#~ msgid "lid %lu: expected dir record, got type %d\n"
-#~ msgstr "lokalt id %lu: v�ntade en katalogpost, fick en post av typen %d\n"
+#~ msgid "export the ownertrust values"
+#~ msgstr "exportera de v�rden som representerar �gartillit"
 
-#~ msgid "no primary key for LID %lu\n"
-#~ msgstr "ingen prim�r nyckel f�r lokalt id %lu\n"
+#~ msgid "import ownertrust values"
+#~ msgstr "importera v�rden som representerar �gartillit"
 
-#~ msgid "error reading primary key for LID %lu: %s\n"
-#~ msgstr "fel vid l�sning av prim�r nyckel f�r lokalt id %lu: %s\n"
+#~ msgid "unattended trust database update"
+#~ msgstr "uppdaterar tillitsdatabasen utan m�nsklig tillsyn"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record misslyckades: %s\n"
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "reparera en korrupt tillitsdatabas"
 
-#~ msgid "key %08lX: query record failed\n"
-#~ msgstr "nyckel %08lX: uppslagning av post misslyckades\n"
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Skala av en fil eller standard in"
 
-#~ msgid "key %08lX: already in trusted key table\n"
-#~ msgstr "nyckel %08lX: finns redan i tabellen �ver p�litliga nycklar\n"
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#~ msgid "NOTE: secret key %08lX is NOT protected.\n"
-#~ msgstr "OBSERVERA: den hemliga nyckeln %08lX �r INTE skyddad.\n"
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#~ msgid "key %08lX: secret and public key don't match\n"
-#~ msgstr "nyckel %08lX: hemlig och publik nyckel st�mmer inte �verens\n"
+#~ msgid "use the default key as default recipient"
+#~ msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "numrering av hemliga nycklar misslyckades: %s\n"
+#~ msgid "don't use the terminal at all"
+#~ msgstr "anv�nd inte terminalen alls"
 
-#~ msgid "key %08lX.%lu: Good subkey binding\n"
-#~ msgstr "nyckel: %08lX.%lu: Korrekt bindning till undernyckel\n"
+#~ msgid "force v3 signatures"
+#~ msgstr "anv�nd v3-signaturer"
 
-#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-#~ msgstr "nyckel %08lX.%lu: Felaktig bindning till undernyckel: %s\n"
+#~ msgid "do not force v3 signatures"
+#~ msgstr "anv�nd inte v3-signaturer"
 
-#~ msgid "key %08lX.%lu: Valid key revocation\n"
-#~ msgstr "nyckel %08lX.%lu: Giltig �terkallelse av nyckel\n"
+#~ msgid "force v4 key signatures"
+#~ msgstr "anv�nd v4-nyckelsignaturer"
 
-#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-#~ msgstr "nyckel %08lX.%lu: Felaktig �terkallelse av nyckel: %s\n"
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "anv�nd inte v4-nyckelsignaturer"
 
-#~ msgid "Good self-signature"
-#~ msgstr "Korrekt sj�lvsignatur"
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#~ msgid "Invalid self-signature"
-#~ msgstr "Felaktig sj�lvsignatur"
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "anv�nd aldrig en MDC f�r kryptering"
 
-# detta verkar mycket m�rkligt. N�gon borde kanske f� en f�rklaring fr�n
-# gnupg-utvecklarna?
-#~ msgid "Valid user ID revocation skipped due to a newer self signature"
+# syftar p� ett anv�ndargr�nsnitt i ett separat program, till exempel gpa
+#~ msgid "use the gpg-agent"
+#~ msgstr "anv�nd gpg-agenten"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "batch-l�ge: fr�ga aldrig"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "anta att svaret �r ja p� de flesta fr�gor"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "anta att svaret �r nej p� de flesta fr�gor"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "l�gg till denna nyckelring till listan av nyckelringar"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "l�gg till denna hemliga nyckelring till listan"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "visa vilken nyckelring den listade nyckeln h�r till"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
+
+#~ msgid "read options from file"
+#~ msgstr "l�s flaggor fr�n fil"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[fil]|skriv statusinformation till fil"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|NYCKELID|lita ovillkorligen p� denna nyckel"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|FIL|ladda till�ggsmodul FIL"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "imitera l�get som beskrivs i RFC1991"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
 #~ msgstr ""
-#~ "Hoppade �ver en giltig �terkallelse av anv�ndaridentiteten p�\n"
-#~ "grund av en nyare sj�lvsignatur"
+#~ "�ndra inst�llningarna f�r paket, kryptering och kontrollsumma s� att gpg "
+#~ "f�ljer OpenPGP-standarden"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "�ndra inst�llningarna f�r paket, kryptering och kontrollsumma s� att gpg "
+#~ "h�rmar PGP 2.x-beteende"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|anv�nd l�senmeningsl�get N"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senmeningar"
 
-#~ msgid "Valid user ID revocation"
-#~ msgstr "Giltig �terkallelse av anv�ndaridentitet"
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|NAMN|anv�nd krypteringsalgoritmen NAMN f�r l�senmeningar"
 
-#~ msgid "Invalid user ID revocation"
-#~ msgstr "Ogiltig �terkallelse av anv�ndaridentitet"
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|NAMN|anv�nd krypteringsalgoritmen NAMN"
 
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Giltig �terkallelse av certifikat"
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#~ msgid "Good certificate"
-#~ msgstr "Korrekt certifikat"
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#~ msgid "Invalid certificate revocation"
-#~ msgstr "Ogiltig �terkallelse av certifikat "
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#~ msgid "Invalid certificate"
-#~ msgstr "Ogiltigt certifikat"
+#~ msgid "Show Photo IDs"
+#~ msgstr "Visa fotoidentifikation"
 
-#~ msgid "sig record %lu[%d] points to wrong record.\n"
-#~ msgstr "signaturpost %lu[%d] pekar mot fel post.\n"
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Visa inte fotoidentifikation"
 
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "dubblett av certifikat - borttaget"
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "S�tt komandoraden f�r att visa fotoientifikation"
 
-#~ msgid "tdbio_search_dir failed: %s\n"
-#~ msgstr "tdbio_search_dir misslyckades: %s\n"
+#, fuzzy
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Det �r inte s�kert att denna nyckel verkligen tillh�r �garen\n"
+#~ "men den accepteras trots detta\n"
 
-#~ msgid "lid ?: insert failed: %s\n"
-#~ msgstr "lokalt id ?: till�gg misslyckades: %s\n"
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "inst�llningen %c%lu �r inte giltig\n"
 
-#~ msgid "lid %lu: insert failed: %s\n"
-#~ msgstr "lokalt id %lu: till�gg misslyckades: %s\n"
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 
-#~ msgid "lid %lu: inserted\n"
-#~ msgstr "lokalt id %lu: lades till\n"
+#~ msgid " (default)"
+#~ msgstr " (standard)"
 
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "fel vid l�sning av katalogpost: %s\n"
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  skapad: %s g�r ut: %s"
 
-#~ msgid "\t%lu keys with errors\n"
-#~ msgstr "\t%lu nycklar med fel\n"
+#~ msgid "Notation: "
+#~ msgstr "Notation: "
 
-#~ msgid "\t%lu keys inserted\n"
-#~ msgstr "\t%lu nycklar tillagda\n"
+# finns det n�gon bra svensk �vers�ttning av policy?
+#~ msgid "Policy: "
+#~ msgstr "Policy: "
 
-#~ msgid "lid %lu: dir record w/o key - skipped\n"
-#~ msgstr "lokalt id %lu: katalogpost utan nyckel - hoppade �ver\n"
+#, fuzzy
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "fr�ga efter nyckeln %08lX fr�n %s ...\n"
 
-#~ msgid "\t%lu due to new pubkeys\n"
-#~ msgstr "\t%lu p� grund av nya publika nycklar\n"
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "kan inte h�mta nyckeln fr�n en nyckelserver: %s\n"
 
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu nycklar hoppades �ver\n"
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "fel vid s�ndning till \"%s\": %s\n"
 
-#~ msgid "\t%lu keys updated\n"
-#~ msgstr "\t%lu nycklar uppdaterades\n"
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "lyckades s�nda till \"%s\" (status=%u)\n"
 
-#~ msgid "Ooops, no keys\n"
-#~ msgstr "Ooops, inga nycklar\n"
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "misslyckades s�nda till \"%s\": status=%u\n"
 
-#~ msgid "Ooops, no user IDs\n"
-#~ msgstr "Ooops, inga anv�ndaridentiteter\n"
+#, fuzzy
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "kan inte h�mta nyckeln fr�n en nyckelserver: %s\n"
 
-#~ msgid "check_trust: search dir record failed: %s\n"
-#~ msgstr "check_trust: s�kning av katalogpost misslyckades: %s\n"
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "nyckel %08lX: detta �r en PGP-genererad ElGamal-nyckel som INTE �r s�ker "
+#~ "f�r signaturer!\n"
+
+# c-format beh�vs inte i singularis
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "nyckeln �r skapad %lu sekund in i framtiden (problemet �r\n"
+#~ "relaterat till tidsresande eller en felst�lld klocka)\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
+#~ "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#~ msgid "key %08lX: insert trust record failed: %s\n"
-#~ msgstr "nyckel %08lX: till�gg av tillitspost misslyckades: %s\n"
+#, fuzzy
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "Certifikat som leder till en p�litlig nyckel:\n"
 
-#~ msgid "key %08lX.%lu: inserted into trustdb\n"
-#~ msgstr "nyckel %08lX.%lu: lades till i tillitsdatabasen\n"
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "V�lj vilken algoritm du vill anv�nda.\n"
+#~ "\n"
+#~ "DSA (�ven k�nd som DSS) �r den algoritm f�r digitala signaturer som bara\n"
+#~ "kan anv�ndas f�r just signaturer. Detta �r den rekommenderade algoritmen\n"
+#~ "eftersom verifiering av DSA-signaturer �r mycket snabbare �n\n"
+#~ "ElGamal-signaturer.\n"
+#~ "\n"
+#~ "ElGamal �r en algoritm som kan anv�ndas f�r signaturer och kryptering.\n"
+#~ "OpenPGP-standarden skiljer p� tv� varianter av denna algoritm: en som "
+#~ "bara\n"
+#~ "kan anv�ndas f�r kryptering och en som b�de kan signera och kryptera.\n"
+#~ "Egentligen �r det samma algoritm, men vissa parametrar m�ste v�ljas p�\n"
+#~ "ett speciellt s�tt f�r att skapa en s�ker nyckel f�r signaturer: detta "
+#~ "program\n"
+#~ "g�r detta men andra OpenPGP-implementationer beh�ver inte f�rst�\n"
+#~ "signatur+kryptering varianten.\n"
+#~ "\n"
+#~ "Den f�rsta (prim�ra) nyckeln m�ste alltid vara en nyckel som kan "
+#~ "anv�ndas\n"
+#~ "f�r att skapa signaturer. Detta �r anledningen till att den ElGamal-"
+#~ "variant\n"
+#~ "som bara krypterar inte �r tillg�nglig i denna meny"
 
-#~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
 #~ msgstr ""
-#~ "nyckel %08lX.%lu: skapad i framtiden (problemet �r relaterat till\n"
-#~ "tidsresande eller en felst�lld klocka)\n"
+#~ "Trots att dessa nycklar �r definierade i RFC2440 �r det inte "
+#~ "rekommenderat\n"
+#~ "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."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "har behandlat %lu nycklar hittills (% lu signaturer)\n"
+
+#, fuzzy
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
+
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "avsluta"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (signering och kryptering)\n"
+
+#, fuzzy
+#~ msgid "Create anyway? "
+#~ msgstr "Vill du anv�nda nyckeln trots det? "
 
-#~ msgid "key %08lX.%lu: expired at %s\n"
-#~ msgstr "nyckel %08lX.%lu: gick ut %s\n"
+#, fuzzy
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#~ msgid "key %08lX.%lu: trust check failed: %s\n"
-#~ msgstr "nyckel %08lX.%lu: tillitskontroll misslyckades: %s\n"
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "denna nyckelserver �r inte helt kompatibel med HKP\n"
 
-#~ msgid "problem finding '%s' in trustdb: %s\n"
-#~ msgstr "problem att hitta \"%s\" i tillitsdatabasen: %s\n"
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr "Anv�ndanadet av denna algoritm �r f�rlegat - skapa �nd�? "
 
-#~ msgid "user '%s' not in trustdb - inserting\n"
-#~ msgstr "anv�ndaren \"%s\" finns inte tillitsdatabasen - l�gger till\n"
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
 
-#~ msgid "failed to put '%s' into trustdb: %s\n"
-#~ msgstr "misslyckades med att placera \"%s\" i tillitsdatabasen: %s\n"
+#~ 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 "WARNING: can't yet handle long pref records\n"
-#~ msgstr "VARNING: kan �nnu inte hantera l�nga inst�llningsposter\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"
 
-#~ msgid "%s: can't create keyring: %s\n"
-#~ msgstr "%s: kan inte skapa nyckelring: %s\n"
+#~ msgid "Fingerprint:"
+#~ msgstr "Fingeravtryck:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "           Fingeravtryck:"
+
+# GnuPG borde v�l ers�ttas med %s?
+#~ msgid "you have to start GnuPG again, so it can read the new options file\n"
+#~ msgstr ""
+#~ "du m�ste starta om GnuPG, s� att den nya inst�llningsfilen kan l�sas\n"
diff --git a/po/tr.po b/po/tr.po
index 2650f9a32..6a87aab6e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,60 +1,79 @@
+# 
 # Turkish translations for GnuPG messages.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Nilg�n Belma Bug�ner <[email protected]>, 2001, 2002.
+# Copyright (C) 2003,2004 Free Software Foundation, Inc.
+# Nilgün Belma Bugüner <[email protected]>, 2001, ...,2003,2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.0\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-09-11 22:09+0300\n"
-"Last-Translator: Nilg�n Belma Bug�ner <[email protected]>\n"
+"Project-Id-Version: gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-07-08 08:10+0300\n"
+"Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.6\n"
+"X-Generator: KBabel 1.0\n"
 
-#: util/secmem.c:88
+#: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
-msgstr "UYARI: kullan�lan bellek g�venli de�il!\n"
+msgstr "UYARI: kullanılan bellek güvenli değil!\n"
 
-#: util/secmem.c:89
+#: util/secmem.c:91
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
-"Daha geni� bilgi edinmek i�in http://www.gnupg.org/faq.html adresine "
-"bak�n�z\n"
+"Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine "
+"bakınız\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "g�venli bellek haz�rlanmadan i�lem yapmak m�mk�n de�il\n"
+msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(bu g�rev i�in yanl�� program kullanm�� olabilirsiniz)\n"
+msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
 msgstr "evet"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
 msgid "yY"
 msgstr "eE"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
 msgid "no"
-msgstr "hay�r"
+msgstr "hayır"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
 msgid "nN"
 msgstr "hH"
 
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
 msgid "quit"
-msgstr "��k��"
+msgstr "quit"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:351
 msgid "qQ"
-msgstr "��"
+msgstr "çÇ"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "k"
 
 #: util/errors.c:54
 msgid "general error"
@@ -66,67 +85,67 @@ msgstr "bilinmeyen paket tipi"
 
 #: util/errors.c:56
 msgid "unknown version"
-msgstr "bilinmeyen s�r�m"
+msgstr "bilinmeyen sürüm"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "bilinmeyen genel anahtar algoritmas�"
+msgstr "bilinmeyen genel anahtar algoritması"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "bilinmeyen �z�mleme algoritmas�"
+msgstr "bilinmeyen özümleme algoritması"
 
 #: util/errors.c:59
 msgid "bad public key"
-msgstr "genel anahtar hatal�"
+msgstr "genel anahtar hatalı"
 
 #: util/errors.c:60
 msgid "bad secret key"
-msgstr "gizli anahtar hatal�"
+msgstr "gizli anahtar hatalı"
 
 #: util/errors.c:61
 msgid "bad signature"
-msgstr "imza hatal�"
+msgstr "imza hatalı"
 
 #: util/errors.c:62
 msgid "checksum error"
-msgstr "\"checksum\" hatas�"
+msgstr "\"checksum\" hatası"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "anahtar parolas� hatal�"
+msgstr "anahtar parolası hatalı"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "genel anahtar bulunamad�"
+msgstr "genel anahtar bulunamadı"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "bilinmeyen �ifre algoritmas�"
+msgstr "bilinmeyen şifre algoritması"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
-msgstr "anahtar zinciri a��lamad�"
+msgstr "anahtar zinciri açılamadı"
 
 #: util/errors.c:67
 msgid "invalid packet"
-msgstr "ge�ersiz paket"
+msgstr "geçersiz paket"
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "ge�ersiz z�rh"
+msgstr "geçersiz zırh"
 
 #: util/errors.c:69
 msgid "no such user id"
-msgstr "b�yle bir kullan�c� kimli�i yok"
+msgstr "böyle bir kullanıcı kimliği yok"
 
 #: util/errors.c:70
 msgid "secret key not available"
-msgstr "gizli anahtar kullan��s�z"
+msgstr "gizli anahtar kullanışsız"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "yanl�� gizli anahtar kullan�lm��"
+msgstr "yanlış gizli anahtar kullanılmış"
 
 #: util/errors.c:72
 msgid "not supported"
@@ -134,79 +153,79 @@ msgstr "desteklenmiyor"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "anahtar hatal�"
+msgstr "anahtar hatalı"
 
 #: util/errors.c:74
 msgid "file read error"
-msgstr "dosya okuma hatas�"
+msgstr "dosya okuma hatası"
 
 #: util/errors.c:75
 msgid "file write error"
-msgstr "dosya yazma hatas�"
+msgstr "dosya yazma hatası"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "bilinmeyen s�k��t�rma algoritmas�"
+msgstr "bilinmeyen sıkıştırma algoritması"
 
 #: util/errors.c:77
 msgid "file open error"
-msgstr "dosya a�ma hatas�"
+msgstr "dosya açma hatası"
 
 #: util/errors.c:78
 msgid "file create error"
-msgstr "dosya olu�turma hatas�"
+msgstr "dosya oluşturma hatası"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "anahtar parolas� ge�ersiz"
+msgstr "anahtar parolası geçersiz"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "tamamlanmam�� genel anahtar algoritmas�"
+msgstr "tamamlanmamış genel anahtar algoritması"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "tamamlanmam�� �ifre algoritmas�"
+msgstr "tamamlanmamış şifre algoritması"
 
 #: util/errors.c:82
 msgid "unknown signature class"
-msgstr "bilinmeyen imza s�n�f�"
+msgstr "bilinmeyen imza sınıfı"
 
 #: util/errors.c:83
 msgid "trust database error"
-msgstr "g�vence veritaban� hatas�"
+msgstr "güvence veritabanı hatası"
 
 #: util/errors.c:84
 msgid "bad MPI"
-msgstr "MPI hatal�"
+msgstr "MPI hatalı"
 
 #: util/errors.c:85
 msgid "resource limit"
-msgstr "i� kaynak s�n�r�"
+msgstr "iç kaynak sınırı"
 
 #: util/errors.c:86
 msgid "invalid keyring"
-msgstr "anahtar zinciri ge�ersiz"
+msgstr "anahtar zinciri geçersiz"
 
 #: util/errors.c:87
 msgid "bad certificate"
-msgstr "sertifika hatal�"
+msgstr "sertifika hatalı"
 
 #: util/errors.c:88
 msgid "malformed user id"
-msgstr "kullan�c� kimli�i bozuk"
+msgstr "kullanıcı kimliği bozuk"
 
 #: util/errors.c:89
 msgid "file close error"
-msgstr "dosya kapama hatas�"
+msgstr "dosya kapama hatası"
 
 #: util/errors.c:90
 msgid "file rename error"
-msgstr "dosya isim de�i�tirme hatas�"
+msgstr "dosya isim değiştirme hatası"
 
 #: util/errors.c:91
 msgid "file delete error"
-msgstr "dosya silme hatas�"
+msgstr "dosya silme hatası"
 
 #: util/errors.c:92
 msgid "unexpected data"
@@ -214,11 +233,11 @@ msgstr "beklenmeyen veri"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
-msgstr "zaman damgas� �eli�kili"
+msgstr "zaman damgası çelişkili"
 
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
-msgstr "genel anahtar algoritmas� kullan��s�z"
+msgstr "genel anahtar algoritması kullanışsız"
 
 #: util/errors.c:95
 msgid "file exists"
@@ -226,15 +245,15 @@ msgstr "dosya mevcut"
 
 #: util/errors.c:96
 msgid "weak key"
-msgstr "anahtar zay�f"
+msgstr "anahtar zayıf"
 
 #: util/errors.c:97
 msgid "invalid argument"
-msgstr "ge�ersiz arg�man"
+msgstr "geçersiz argüman"
 
 #: util/errors.c:98
 msgid "bad URI"
-msgstr "URI hatal�"
+msgstr "URI hatalı"
 
 #: util/errors.c:99
 msgid "unsupported URI"
@@ -242,95 +261,102 @@ msgstr "desteklenmeyen URI"
 
 #: util/errors.c:100
 msgid "network error"
-msgstr "a� hatas�"
+msgstr "ağ hatası"
 
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "�ifrelenemedi"
+msgstr "şifrelenemedi"
 
 #: util/errors.c:103
 msgid "not processed"
-msgstr "i�lenemedi"
+msgstr "işlenemedi"
 
-#. the key cannot be used for a specific usage
 #: util/errors.c:105
 msgid "unusable public key"
-msgstr "genel anahtar kullan�md���"
+msgstr "genel anahtar kullanımdışı"
 
 #: util/errors.c:106
 msgid "unusable secret key"
-msgstr "gizli anahtar kullan�md���"
+msgstr "gizli anahtar kullanımdışı"
 
 #: util/errors.c:107
 msgid "keyserver error"
-msgstr "anahtar sunucusu hatas�"
+msgstr "anahtar sunucusu hatası"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
 
-#: util/logger.c:249
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "... bu bir yaz�l�m hatas� (%s:%d:%s)\n"
+msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 
-#: util/logger.c:255
+#: util/logger.c:285
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
-msgstr "bir yaz�l�m hatas� buldunuz ... (%s:%d)\n"
+msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr "rasgele bayt elde etme mod�l� bulunamad�\n"
+msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "`%s' a��lam�yor: %s\n"
+msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "`%s' durumlanam�yor: %s\n"
+msgstr "`%s' durumlanamıyor: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' d�zenli bir dosya de�il - g�r�lmedi\n"
+msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
-msgstr "not: \"random_seed\" dosyas� bo�\n"
+msgstr "not: \"random_seed\" dosyası boş\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "UYARI: random_seed dosyas�n�n boyu hatal� - kullan�lmad�\n"
+msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "\"%s\" okunam�yor: %s\n"
+msgstr "\"%s\" okunamıyor: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
-msgstr "bilgi: \"random_seed\" dosyas� g�ncel de�il\n"
+msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "\"%s\" olu�turulam�yor: %s\n"
+msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "\"%s\" yaz�lam�yor: %s\n"
+msgstr "\"%s\" yazılamıyor: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "\"%s\" kapat�lam�yor: %s\n"
+msgstr "\"%s\" kapatılamıyor: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "UYARI: kullan�lan rasgele say� �reteci g�venli de�il!!\n"
+msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:729
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,10 +364,10 @@ msgid ""
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"Rasgele say� �reteci kendi halinde �al��an\n"
-"bir kukla - g�venilir bir RS� de�il!\n"
+"Rasgele sayı üreteci kendi halinde çalışan\n"
+"bir kukla - güvenilir bir RSÜ değil!\n"
 "\n"
-"BU PROGRAMLA �RET�LM�� H��B�R VER�Y� KULLANMAYIN!!\n"
+"BU PROGRAMLA ÜRETİLMİŞ HİÇBİR VERİYİ KULLANMAYIN!!\n"
 "\n"
 
 #: cipher/rndlinux.c:134
@@ -352,11 +378,35 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 "\n"
-"Rasgele �retilen baytlar yetersiz. L�tfen baz� i�lemler yaparak\n"
-"daha fazla rasgele bayt toplayabilmesi i�in i�letim sistemine\n"
-"yard�mc� olun! (%d bayt daha gerekiyor)\n"
+"Rasgele üretilen baytlar yetersiz. Lütfen bazı işlemler yaparak\n"
+"daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
+"yardımcı olun! (%d bayt daha gerekiyor)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n"
 
-#: g10/g10.c:307
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Lütfen bekleyin rasgele baytlar toplanıyor. Bu işlem sırasında başka\n"
+"işlere bakın, çünkü bu anahtarınızın daha kaliteli olmasını sağlayacak.\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "%d bitten daha küçük bir asal sayı üretilemiyor\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "%d bitten daha küçük bir asal sayı üretilemiyor\n"
+
+#: g10/g10.c:354
 msgid ""
 "@Commands:\n"
 " "
@@ -364,371 +414,194 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:356
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:310
+#: g10/g10.c:357
 msgid "|[file]|make a clear text signature"
-msgstr "|[dosya]|a��k�a okunabilen bir imza yapar"
+msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:311
+#: g10/g10.c:358
 msgid "make a detached signature"
-msgstr "ba��ms�z bir imza yapar"
+msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:312
+#: g10/g10.c:359
 msgid "encrypt data"
-msgstr "veriyi �ifreler"
-
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[dosyalar]|dosyalar �ifrelenir"
+msgstr "veriyi şifreler"
 
-#: g10/g10.c:314
+#: g10/g10.c:361
 msgid "encryption only with symmetric cipher"
-msgstr "sadece simetrik �ifre ile �ifreler"
-
-#: g10/g10.c:315
-msgid "store only"
-msgstr "sadece saklar"
+msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/g10.c:316
+#: g10/g10.c:363
 msgid "decrypt data (default)"
-msgstr "veri �ifresini a�ar (�ntan�ml�)"
-
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[dosyalar]|dosyalar�n �ifresi a��l�r"
+msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:318
+#: g10/g10.c:365
 msgid "verify a signature"
-msgstr "bir imzay� do�rular"
+msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:320
+#: g10/g10.c:367
 msgid "list keys"
-msgstr "anahtarlar� listeler"
+msgstr "anahtarları listeler"
 
-#: g10/g10.c:322
+#: g10/g10.c:369
 msgid "list keys and signatures"
-msgstr "anahtarlar� ve imzalar� listeler"
+msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:323
-msgid "check key signatures"
-msgstr "anahtar imzalar�n� kontrol eder"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "anahtar imzalarını kontrol eder"
 
-#: g10/g10.c:324
+#: g10/g10.c:371
 msgid "list keys and fingerprints"
-msgstr "anahtarlar� ve parmak izlerini listeler"
+msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:325
+#: g10/g10.c:372
 msgid "list secret keys"
-msgstr "gizli anahtarlar� listeler"
+msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:326
+#: g10/g10.c:373
 msgid "generate a new key pair"
-msgstr "yeni bir anahtar �ifti �retir"
+msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:327
+#: g10/g10.c:374
 msgid "remove keys from the public keyring"
-msgstr "anahtarlar� genel anahtar zincirinden siler"
+msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:329
+#: g10/g10.c:376
 msgid "remove keys from the secret keyring"
-msgstr "anahtarlar� gizli anahtar zincirinden siler"
+msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:330
+#: g10/g10.c:377
 msgid "sign a key"
-msgstr "bir anahtar� imzalar"
+msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:331
+#: g10/g10.c:378
 msgid "sign a key locally"
-msgstr "bir anahtar� yerel olarak imzalar"
+msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "bir anahtar� iptal edilemez olarak imzalar"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "bir anahtar� yerel ve iptal edilemez olarak imzalar"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
 msgid "sign or edit a key"
-msgstr "bir anahtar� d�zenler ve imzalar"
+msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:335
+#: g10/g10.c:382
 msgid "generate a revocation certificate"
-msgstr "bir y�r�rl�kten kald�rma sertifikas� �retir"
+msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:337
+#: g10/g10.c:384
 msgid "export keys"
-msgstr "anahtarlar� g�nderir"
+msgstr "anahtarları gönderir"
 
-#: g10/g10.c:338
+#: g10/g10.c:385
 msgid "export keys to a key server"
-msgstr "anahtarlar� bir anahtar sunucusuna g�nderir"
+msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:339
+#: g10/g10.c:386
 msgid "import keys from a key server"
-msgstr "anahtarlar� bir anahtar sunucusundan indirir"
+msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:341
+#: g10/g10.c:388
 msgid "search for keys on a key server"
-msgstr "bir anahtar sunucusunda anahtarlar� arar"
+msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:343
+#: g10/g10.c:390
 msgid "update all keys from a keyserver"
-msgstr "anahtarlar� bir anahtar sunucusundan g�nceller"
+msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:347
+#: g10/g10.c:393
 msgid "import/merge keys"
-msgstr "anahtarlar� indirir/kat��t�r�r"
+msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "sadece paketlerin silsilesini listeler"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
 
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "sahibining�vencesi de�erlerini g�nderir"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
 
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "sahibining�vencesi de�erlerini indirir"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
 
-#: g10/g10.c:355
+#: g10/g10.c:406
 msgid "update the trust database"
-msgstr "g�vence veritaban�n� g�nceller"
-
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "bak�ms�z g�vence veritaban�n�n g�ncellemesi"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "bozulan g�vence veritaban�n� onar�r"
+msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr "Bir dosya veya standart girdinin z�rh�n� kald�r�r"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "Bir dosya veya standart girdiyi z�rhlar"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
 msgid "|algo [files]|print message digests"
-msgstr "|algo [dosyalar]|ileti �z�mlemelerini g�sterir"
+msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
 " "
 msgstr ""
 "@\n"
-"Se�enekler:\n"
+"Seçenekler:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:419
 msgid "create ascii armored output"
-msgstr "ascii z�rhl� ��kt� olu�turur"
+msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:371
+#: g10/g10.c:421
 msgid "|NAME|encrypt for NAME"
-msgstr "|�S�M|�S�M i�in �ifreleme yapar"
-
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr "|�S�M|�ntan�ml� al�c� olarak �S�M kullan�l�r"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "�ntan�ml� al�c� olarak �ntan�ml� anahtar kullan�l�r"
+msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:382
+#: g10/g10.c:432
 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"
+msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/g10.c:383
+#: g10/g10.c:433
 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)"
+msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/g10.c:385
+#: g10/g10.c:438
 msgid "use canonical text mode"
-msgstr "kurall� metin kipini kullan�r"
+msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:392
+#: g10/g10.c:448
 msgid "use as output file"
-msgstr "��kt� dosyas� olarak kullan�l�r"
+msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
 msgid "verbose"
-msgstr "�ok detayl�"
-
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "daha az detayl�"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "terminali hi� kullanma"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "v3 imzalar�na zorlar"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "v3 imzalara zorlamaz"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "v4 imzalara zorlar"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "v4 imzalara zorlamaz"
+msgstr "çok detaylı"
 
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "�ifreleme i�in daima bir MDC kullan�l�r"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "�ifreleme i�in asla bir MDC kullan�lmaz"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
 msgid "do not make any changes"
-msgstr "hi�bir de�i�iklik yapmaz"
+msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/g10.c:405
+#: g10/g10.c:462
 msgid "prompt before overwriting"
-msgstr "�zerine yazmadan �nce sorar"
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "gpg-agent kullan"
-
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "�nceden belirlenmi� i�lemler kipi: hi� sormaz"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
-msgstr "sorular�n �o�unda cevap evet farzedilir"
-
-#: g10/g10.c:411
-msgid "assume no on most questions"
-msgstr "sorular�n �o�unda cevap hay�r farzedilir"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "bu gizli anahtar zincirini listeye ekler"
-
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "listedeki bir anahtar�n hangi anahtar zincirinde oldu�unu g�sterir"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr "|�S�M|�ntan�ml� gizli anahtar olarak �S�M kullan�l�r"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|MAK�NA|anahtarlar� aramak i�in bu anahtar sunucusu kullan�l�r"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|�S�M|terminal karakter setini �S�M olarak ayarlar"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr "se�enekleri dosyadan okur"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr "|FD|durum bilgisini bu FD'ye yazar"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|ANHK�ML|bu anahtar son derece g�venli"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr "|DOSYA|geni�letme mod�l� olarak DOSYA y�klenir"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr "RFC1991 de a��klanan kipi uygular"
-
-#: g10/g10.c:442
-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"
+msgstr "üzerine yazmadan önce sorar"
 
-#: g10/g10.c:443
-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:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|anahtar parolas� kipi olarak N kullan�l�r"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
 msgstr ""
-"|�S�M|anahtar parolalar� i�in ileti �z�mleme algoritmas� olarak �S�M "
-"kullan�l�r"
-
-#: g10/g10.c:453
-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:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|�S�M|�ifre algoritmas� olarak �S�M kullan�l�r"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|�S�M|�z�mleme algoritmas� olarak �S�M kullan�l�r"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr "|N|s�k��t�rma algoritmas� olarak N kullan�l�r"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr "�ifreli paketlerin anahtar-kimlik alanlar�n� atar"
 
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "Foto kimliklerini g�sterir"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "Foto kimliklerini g�stermez"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
 
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr "Komut sat�r�n� foto kimliklerini g�stermeye ayarlar"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
 
-#: g10/g10.c:468
+#: g10/g10.c:535
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 "@\n"
-"(T�m komut ve se�eneklerin komple listesi i�in man sayfalar�na bak�n)\n"
+"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:471
+#: g10/g10.c:538
 msgid ""
 "@\n"
 "Examples:\n"
@@ -740,33 +613,33 @@ msgid ""
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 "@\n"
-"�rnekler:\n"
+"Örnekler:\n"
 "\n"
-" -se -r Ali [dosya]         kullan�c� Ali i�in imzalar ve �ifreler\n"
-" --clearsign [dosya]        a��k�a okunabilir bir imza yapar\n"
-" --detach-sign [dosya]      ba��ms�z bir imza yapar\n"
-" --list-keys [isimler]      anahtarlar� listeler\n"
-" --fingerprint [isimler]    parmak izlerini g�sterir\n"
+" -se -r Ali [dosya]         kullanıcı Ali için imzalar ve şifreler\n"
+" --clearsign [dosya]        açıkça okunabilir bir imza yapar\n"
+" --detach-sign [dosya]      bağımsız bir imza yapar\n"
+" --list-keys [isimler]      anahtarları listeler\n"
+" --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
 msgid "Please report bugs to <[email protected]>.\n"
-msgstr "Yaz�l�m hatalar�n� l�tfen <[email protected]> adresine bildirin.\n"
+msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:627
+#: g10/g10.c:730
 msgid "Usage: gpg [options] [files] (-h for help)"
-msgstr "Kullan�m�: gpg [se�enekler] [dosyalar] (yard�m i�in -h)"
+msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:630
+#: g10/g10.c:733
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
-"Yaz�l���: gpg [se�enekler] [dosyalar]\n"
-"imzalama, kontrol, �ifreleme veya ��zme\n"
-"�ntan�ml� i�lem girilen veriye ba��ml�d�r\n"
+"Yazılışı: gpg [seçenekler] [dosyalar]\n"
+"imzalama, kontrol, şifreleme veya çözme\n"
+"öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:641
+#: g10/g10.c:744
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -774,752 +647,990 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "GenAnah: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "Şifre: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "Sıkıştırma: "
+
+#: g10/g10.c:848
 msgid "usage: gpg [options] "
-msgstr "kullan�m�: gpg [se�enekler] "
+msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:802
+#: g10/g10.c:951
 msgid "conflicting commands\n"
-msgstr "�eli�en komutlar\n"
+msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:820
+#: g10/g10.c:969
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
-msgstr "grup tan�m� \"%s\" i�inde = i�areti yok\n"
+msgstr "grup tanımı \"%s\" içinde = işareti yok\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
 
-#: g10/g10.c:983
-#, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "UYARI: %s \"%s\" de g�vensiz sahiplik\n"
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
 
-#: g10/g10.c:986
-#, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "UYARI: %s \"%s\" de g�vensiz izinler\n"
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
 
-#: g10/g10.c:989
-#, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "UYARI: %s \"%s\" de g�vensiz ili�tirilen dizin sahipli�i\n"
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1334
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "UYARI: %s \"%s\" de g�vensiz ili�tirilen dizin izinleri\n"
+msgid "unknown configuration item \"%s\"\n"
+msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1601
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "B�LG�: eski �ntan�ml� se�enekler dosyas� `%s' yoksay�ld�\n"
+msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/g10.c:1204
+#: g10/g10.c:1637
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "B�LG�: `%s' �ntan�ml� se�enek dosyas� yok\n"
+msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1208
+#: g10/g10.c:1641
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "se�enek dosyas� \"%s\": %s\n"
+msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1648
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "\"%s\"den se�enekler okunuyor\n"
+msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:1390
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, 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:1887
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
-msgstr "�ifre uzant�s� \"%s\" g�vensiz izinlerden dolay� y�klenmedi\n"
+msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/g10.c:1523
+#: g10/g10.c:2099
 #, c-format
 msgid "%s is not a valid character set\n"
-msgstr "%s ge�erli bir karakter seti de�il\n"
+msgstr "%s geçerli bir karakter seti değil\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
-msgstr "anahtar sunucusunun adresi ��z�mlenemedi\n"
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:1550
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "dışsallaştırma seçenekleri geçersiz\n"
+
+#: g10/g10.c:2134
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: ge�ersiz i�selle�tirme se�enekleri\n"
+msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:1553
+#: g10/g10.c:2137
 msgid "invalid import options\n"
-msgstr "i�selle�tirme se�enekleri ge�ersiz\n"
+msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:1560
+#: g10/g10.c:2144
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d ge�ersiz d��salla�t�rma se�enekleri\n"
+msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:1563
+#: g10/g10.c:2147
 msgid "invalid export options\n"
-msgstr "d��salla�t�rma se�enekleri ge�ersiz\n"
+msgstr "dışsallaştırma seçenekleri geçersiz\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "içselleştirme seçenekleri geçersiz\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "dışsallaştırma seçenekleri geçersiz\n"
+
+#: g10/g10.c:2208
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr "�al��t�r�labilirlerin patikas� %s yap�lam�yor\n"
+msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:1688
+#: g10/g10.c:2398
 msgid "WARNING: program may create a core file!\n"
-msgstr "UYARI: program bir \"core\" dosyas� olu�turabilir!\n"
+msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:1692
+#: g10/g10.c:2402
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "UYARI: %s %s'i a��yor\n"
-
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "B�LG�: %s normal kullan�m i�in de�il!\n"
+msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s ile %s birlikte kullan�lmaz!\n"
+msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:1704
+#: g10/g10.c:2414
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:1731
+#: g10/g10.c:2435
 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"
+msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:1737
+#: g10/g10.c:2441
 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"
+msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:1743
+#: g10/g10.c:2447
 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"
+msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:2460
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "--pgp2 kipinde ileti �ifrelemesi IDEA �ifresi gerektirir\n"
-
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "bu ileti %s taraf�ndan kullan�lamayabilir\n"
+msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
 msgid "selected cipher algorithm is invalid\n"
-msgstr "se�ilen �ifre algoritmas� ge�ersiz\n"
+msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
 msgid "selected digest algorithm is invalid\n"
-msgstr "se�ilen �z�mleme algoritmas� ge�ersiz\n"
+msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1830
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "se�ilen sertifikalama �z�mleme algoritmas� ge�ersiz\n"
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:1845
-#, 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:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1847
+#: g10/g10.c:2561
 msgid "completes-needed must be greater than 0\n"
-msgstr "\"completes-needed\" 0 dan b�y�k olmal�\n"
+msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:1849
+#: g10/g10.c:2563
 msgid "marginals-needed must be greater than 1\n"
-msgstr "\"marginals-needed\" 1 den b�y�k olmal�\n"
+msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:1851
-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:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:1854
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
+
+#: g10/g10.c:2572
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "B�LG�: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
+msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:1858
+#: g10/g10.c:2576
 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:1862
-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"
+msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:2583
 msgid "invalid default preferences\n"
-msgstr "�ntan�ml� tercihler ge�ersiz\n"
+msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:1876
+#: g10/g10.c:2592
 msgid "invalid personal cipher preferences\n"
-msgstr "ki�isel �ifre tercihleri ge�ersiz\n"
+msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:1880
+#: g10/g10.c:2596
 msgid "invalid personal digest preferences\n"
-msgstr "ki�isel �z�mleme tercihleri ge�ersiz\n"
+msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:1884
+#: g10/g10.c:2600
 msgid "invalid personal compress preferences\n"
-msgstr "ki�isel s�k��t�rma tercihleri ge�ersiz\n"
+msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:1977
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s henüz %s ile çalışmıyor\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s şifreleme algoritması kullanılamayabilir.\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s özümleme algoritması kullanılamayabilir.\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s sıkıştırma algoritması kullanılamayabilir.\n"
+
+#: g10/g10.c:2778
 #, 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"
+msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:2789
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "UYARI: al�c�lar (-r) genel anahtar �ifrelemesi kullan�lmadan belirtilmi�\n"
+msgstr ""
+"UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/g10.c:1997
+#: g10/g10.c:2800
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:2004
+#: g10/g10.c:2807
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:2012
+#: g10/g10.c:2819
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [dosyaismi]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+
+#: g10/g10.c:2855
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:2042
+#: g10/g10.c:2868
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [dosyaismi]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+
+#: g10/g10.c:2908
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:2065
+#: g10/g10.c:2917
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:2083
+#: g10/g10.c:2942
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2950
 msgid "--sign-key user-id"
-msgstr "--sign-key kullan�c�-kimli�i"
+msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:2102
+#: g10/g10.c:2954
 msgid "--lsign-key user-id"
-msgstr "--lsign-key kullan�c�-kimli�i"
+msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:2110
+#: g10/g10.c:2958
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:2118
+#: g10/g10.c:2962
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:2126
+#: g10/g10.c:2986
 msgid "--edit-key user-id [commands]"
-msgstr "--edit-key kullan�c�-kimli�i [komutlar]"
+msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
 #, c-format
 msgid "can't open %s: %s\n"
-msgstr "%s a��lamad�: %s\n"
+msgstr "%s açılamadı: %s\n"
 
-#: g10/g10.c:2197
+#: g10/g10.c:3057
 msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [kullan�c�-kimli�i] [anahtar-zinciri]"
+msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
+
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send başarısızlığa uğradı: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive başarısızlığa uğradı: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search başarısızlığa uğradı: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh başarısız: %s\n"
+
+#: g10/g10.c:3160
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "z�rh�n kald�r�lmas� ba�ar�s�z: %s\n"
+msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:2297
+#: g10/g10.c:3168
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "z�rhlama ba�ar�s�z: %s\n"
+msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:2384
+#: g10/g10.c:3255
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "`%s' hash algoritmas� ge�ersiz\n"
+msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:2470
+#: g10/g10.c:3378
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:2474
+#: g10/g10.c:3382
 msgid "Go ahead and type your message ...\n"
-msgstr "�letinizi yaz�n ...\n"
+msgstr "İletinizi yazın ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "`%s' a��lamad�\n"
+msgstr "`%s' açılamadı\n"
 
-#: g10/g10.c:2691
+#: g10/g10.c:3659
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
-"bir niteleme ismi sadece yaz�labilir karakterler ve bo�luklar i�erebilir ve "
-"bir '=' ile biter.\n"
+"bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
+"sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:2700
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
+
+#: g10/g10.c:3678
 msgid "a notation value must not use any control characters\n"
-msgstr "bir niteleme de�erinde kontrol karakterleri kullan�lamaz\n"
+msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:2737
+#: g10/g10.c:3712
 msgid "the given certification policy URL is invalid\n"
-msgstr "belirtilen sertifika g�vence adresi ge�ersiz\n"
+msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:2739
+#: g10/g10.c:3714
 msgid "the given signature policy URL is invalid\n"
-msgstr "belirtilen imza g�vence adresi ge�ersiz\n"
+msgstr "belirtilen imza güvence adresi geçersiz\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "belirtilen imza güvence adresi geçersiz\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "daha az detaylı"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "anahtarlar bu anahtarlıktan alınır"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|durum bilgisini bu FD'ye yazar"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/armor.c:314
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Kullanımı: gpg [seçenekler] [dosyalar]\n"
+"Bilinen güvenli anahtarlara göre imzaları kontrol eder\n"
+
+#: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
-msgstr "z�rh: %s\n"
+msgstr "zırh: %s\n"
 
-#: g10/armor.c:343
+#: g10/armor.c:346
 msgid "invalid armor header: "
-msgstr "z�rh ba�l��� ge�ersiz: "
+msgstr "zırh başlığı geçersiz: "
 
-#: g10/armor.c:350
+#: g10/armor.c:353
 msgid "armor header: "
-msgstr "z�rh ba�l���: "
+msgstr "zırh başlığı: "
 
-#: g10/armor.c:361
+#: g10/armor.c:364
 msgid "invalid clearsig header\n"
-msgstr "a��k�a okunabilen imza ba�l��� ge�ersiz\n"
+msgstr "açıkça okunabilen imza başlığı geçersiz\n"
 
-#: g10/armor.c:413
+#: g10/armor.c:416
 msgid "nested clear text signatures\n"
-msgstr "a��k�a okunabilen imzalar dahil edildi\n"
+msgstr "açıkça okunabilen imzalar dahil edildi\n"
 
-#: g10/armor.c:537
+#: g10/armor.c:553
 msgid "invalid dash escaped line: "
-msgstr "ara�izgisi escape'l� sat�r ge�ersiz: "
+msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:549
+#: g10/armor.c:565
 msgid "unexpected armor:"
-msgstr "beklenmeyen z�rh: "
+msgstr "beklenmeyen zırh: "
 
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "ge�ersiz radix64 karakteri %02x atland�\n"
+msgstr "geçersiz radix64 karakteri %02x atlandı\n"
 
-#: g10/armor.c:718
+#: g10/armor.c:738
 msgid "premature eof (no CRC)\n"
 msgstr "dosya sonu belirsiz (CRC yok)\n"
 
-#: g10/armor.c:752
+#: g10/armor.c:772
 msgid "premature eof (in CRC)\n"
-msgstr "dosya sonu belirsiz (CRC i�inde)\n"
+msgstr "dosya sonu belirsiz (CRC içinde)\n"
 
-#: g10/armor.c:756
+#: g10/armor.c:776
 msgid "malformed CRC\n"
-msgstr "CRC bozulmu�\n"
+msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
-msgstr "CRC hatas�; %06lx - %06lx\n"
+msgstr "CRC hatası; %06lx - %06lx\n"
 
-#: g10/armor.c:780
+#: g10/armor.c:800
 msgid "premature eof (in Trailer)\n"
-msgstr "dosya sonu belirsiz (kuyruk i�inde)\n"
+msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 
-#: g10/armor.c:784
+#: g10/armor.c:804
 msgid "error in trailer line\n"
-msgstr "kuyruk sat�r�nda hata\n"
+msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1057
+#: g10/armor.c:1091
 msgid "no valid OpenPGP data found.\n"
-msgstr "ge�erli OpenPGP verisi yok\n"
+msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1062
+#: g10/armor.c:1096
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "ge�ersiz z�rh: sat�r %d karakterden uzun\n"
+msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"z�rh i�inde uluslararas� karakterler - b�y�k olas�l�kla hatal� bir e-posta "
-"sunucusu kullan�lm��\n"
+"zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
+"sunucusu kullanılmış\n"
 
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
 msgid "No reason specified"
-msgstr "Belirtilmi� bir neden yok"
+msgstr "Belirtilmiş bir neden yok"
 
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
 msgid "Key is superseded"
-msgstr "Anahtar�n yerine ba�kas� konulmu� ve iptal edilmi�tir"
+msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
 msgid "Key is no longer used"
-msgstr "Anahtar art�k kullan�lmayacak"
+msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
 msgid "User ID is no longer valid"
-msgstr "Kullan�c� kimli�i art�k ge�ersiz"
+msgstr "Kullanıcı kimliği artık geçersiz"
 
 #: g10/pkclist.c:73
 msgid "reason for revocation: "
-msgstr "y�r�rl�kten kald�rma sebebi: "
+msgstr "yürürlükten kaldırma sebebi: "
 
 #: g10/pkclist.c:90
 msgid "revocation comment: "
-msgstr "y�r�rl�kten kald�rma a��klamas�: "
+msgstr "yürürlükten kaldırma açıklaması: "
 
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
 msgid "iImMqQsS"
 msgstr "bBmMaAkK"
 
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
 msgstr ""
-"G�ven derecesi belirtilmemi�:\n"
+"Güven derecesi belirtilmemiş:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                den \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                den \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
 "checking fingerprints from different sources...)?\n"
 "\n"
 msgstr ""
-"Di�er kullan�c�lar� anahtarlar�n do�rulayacak\n"
-"bu kullan�c�n�n g�ven derecesine l�tfen karar verin.\n"
-"(pasportuna m� bakars�n�z yoksa farkl� kaynaklardan\n"
-"parmakizlerini mi kontrol edersiniz...)? karar�n�z� verin\n"
-
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+"Diğer kullanıcıları anahtarların doğrulayacak\n"
+"bu kullanıcının güven derecesine lütfen karar verin.\n"
+"(pasportuna mı bakarsınız yoksa farklı kaynaklardan\n"
+"parmakizlerini mi kontrol edersiniz...)? kararınızı verin\n"
+
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
 msgstr " %d = bilmiyorum\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
 #, c-format
 msgid " %d = I do NOT trust\n"
-msgstr " %d = g�vence vermem\n"
+msgstr " %d = güvence vermem\n"
 
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr " %d = ��yle b�yle g�veniyorum\n"
+msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
 #, c-format
 msgid " %d = I trust fully\n"
-msgstr " %d = Tamamen g�veniyorum\n"
+msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr " %d = Son derece g�veniyorum\n"
+msgstr " %d = Son derece güveniyorum\n"
 
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
 msgid " i = please show me more information\n"
 msgstr " b = Daha fazla bilgi gerekli\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
 msgid " m = back to the main menu\n"
-msgstr " m = ana men�ye d�n\n"
+msgstr " m = ana menüye dön\n"
 
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
 msgid " s = skip this key\n"
-msgstr " a = bu anahtar� atla\n"
+msgstr " a = bu anahtarı atla\n"
 
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
 msgid " q = quit\n"
-msgstr " k = ��k\n"
+msgstr " k = çık\n"
 
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
 msgid "Your decision? "
-msgstr "Karar�n�z? "
+msgstr "Kararınız? "
 
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Bu anahtara ger�ekten en y�ksek g�ven derecesini vermek istiyor musunuz?"
+msgstr ""
+"Bu anahtara gerçekten en yüksek güven derecesini vermek istiyor musunuz?"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "Son derece g�venli bir anahtarla sonu�lanan sertifikalar:\n"
+msgstr "Son derece güvenli bir anahtarla sonuçlanan sertifikalar:\n"
 
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
-msgstr "anahtar %08lX: anahtar y�r�rl�kten kald�r�lm��t�!\n"
+msgstr "anahtar %08lX: anahtar yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
 msgid "Use this key anyway? "
-msgstr "Bu anahtar yine de kullan�ls�n m�? "
+msgstr "Bu anahtar yine de kullanılsın mı? "
 
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
-msgstr "anahtar %08lX: yard�mc� anahtar y�r�rl�kten kald�r�lm��t�!\n"
+msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
 #, c-format
 msgid "%08lX: key has expired\n"
-msgstr "%08lX: anahtar�n kullan�m s�resi dolmu�\n"
+msgstr "%08lX: anahtarın kullanım süresi dolmuş\n"
 
-#: g10/pkclist.c:448
-#, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Bu anahtar�n ger�ekten sahibine ait oldu�una dair bir belirti yok\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr ""
+"%08lX: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
-msgstr "%08lX: Bu anahtara g�ven-mi-yoruz\n"
+msgstr "%08lX: Bu anahtara güven-mi-yoruz\n"
 
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Bu anahtar�n ger�ekten sahibine ait olup olmad���ndan emin\n"
-"olunamad� fakat yine de kabul edildi.\n"
+"%08lX: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
 
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
-msgstr "Bu anahtar�n sahibine ait oldu�u umuluyor\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "Bu anahtarın sahibine ait olduğu umuluyor\n"
 
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
 msgid "This key belongs to us\n"
 msgstr "Bu anahtar bizim\n"
 
-#: g10/pkclist.c:513
+#: g10/pkclist.c:500
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"Bu anahtar�n kullan�c� kimli�inde ismi belirtilen �ahsa ait\n"
-"oldu�u kesin DE��L. *Ger�ekten* ne yapt���n�z� biliyorsan�z,\n"
-"sonraki soruya da evet cevab� verebilirsiniz.\n"
+"Bu anahtarın kullanıcı kimliğinde ismi belirtilen şahsa ait\n"
+"olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
+"sonraki soruya da evet cevabı verebilirsiniz.\n"
 
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
 msgid "WARNING: Using untrusted key!\n"
-msgstr "UYARI: G�ven derecesiz anahtar kullan�l�yor!\n"
+msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr ""
+"UYARI: bu anahtar yürürlükten kaldırılmış olabilir (yürürlükten kaldırma "
+"anahtarı mevcut değil)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
+
+#: g10/pkclist.c:563
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "UYARI: Bu anahtar sahibi taraf�ndan y�r�rl�kten kald�r�lm��t�!\n"
+msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
 msgid "         This could mean that the signature is forgery.\n"
-msgstr "         Bu imza sahte anlam�na gelebilir.\n"
+msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "UYARI: Bu yard�mc� anahtar sahibi taraf�ndan y�r�rl�kten kald�r�lm��t�!\n"
+msgstr ""
+"UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
 msgid "Note: This key has been disabled.\n"
 msgstr "Bilgi: Bu anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
 msgid "Note: This key has expired!\n"
-msgstr "Bilgi: Bu anahtar�n kullan�m s�resi dolmu�tu!\n"
+msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "UYARI: Bu anahtar g�ven dereceli bir imza ile sertifikalanmam��!\n"
+msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:598
-msgid "         There is no indication that the signature belongs to the owner.\n"
-msgstr "         Bu imzan�n sahibine ait oldu�una dair bir belirti yok.\n"
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "UYARI: Bu anahtara g�ven-mi-yoruz!\n"
+msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
-#: g10/pkclist.c:615
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"UYARI: Bu anahtar yeterli g�ven derecesine sahip imzalarla "
-"sertifikalanmam��!\n"
+"UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
+"sertifikalanmamış!\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
 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"
+msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
 #, c-format
 msgid "%s: skipped: %s\n"
-msgstr "%s: atland�: %s\n"
+msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: atland�: genel anahtar zaten var\n"
+msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "Bir kullan�c� kimli�i belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
+msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 "\n"
-"Kullan�c� kimli�ini girin. Bo� bir sat�r i�lemi sonland�r�r:"
+"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
 msgid "No such user ID.\n"
-msgstr "B�yle bir kullan�c� kimli�i yok.\n"
+msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
 msgid "skipped: public key already set as default recipient\n"
-msgstr "atland�: genel anahtar zaten �ntan�ml� al�c� olarak ayarlanm��\n"
+msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
 msgid "skipped: public key already set\n"
-msgstr "atland�: genel anahtar zaten belirtilmi�\n"
+msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
 #, c-format
 msgid "unknown default recipient `%s'\n"
-msgstr "�ntan�ml� al�c� `%s' bilinmiyor\n"
+msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
 
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: atland�: genel anahtar iptal edildi\n"
+msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
 msgid "no valid addressees\n"
-msgstr "ge�erli adresler yok\n"
-
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr "%c%lu tercihi ge�ersiz\n"
+msgstr "geçerli adresler yok\n"
 
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
 msgstr "%c%lu tercihi yinelendi\n"
 
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
-msgstr "`%c' tercih �ok fazla\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "`%c' tercih çok fazla\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "`%c' tercih çok fazla\n"
 
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "tercih dizgesindeki karakter ge�ersiz\n"
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "`%c' tercih çok fazla\n"
 
-#: g10/keygen.c:524
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "tercih dizgesindeki karakter geçersiz\n"
+
+#: g10/keygen.c:738
 msgid "writing direct signature\n"
-msgstr "do�rudan imza yaz�l�yor\n"
+msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:777
 msgid "writing self signature\n"
-msgstr "�z-imza yaz�l�yor\n"
+msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:607
+#: g10/keygen.c:823
 msgid "writing key binding signature\n"
-msgstr "anahtar� garantileyen imzay� yaz�yor\n"
+msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "anahtar uzunlu�u ge�ersiz; %u bit kullan�l�yor\n"
+msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
 #, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "anahtar uzunlu�u %u bite yuvarland�\n"
+msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
 msgid "Please select what kind of key you want:\n"
-msgstr "L�tfen istedi�iniz anahtar� se�iniz:\n"
+msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:943
-#, c-format
-msgid "   (%d) DSA and ElGamal (default)\n"
-msgstr "   (%d) DSA ve ElGamal (�ntan�ml�)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (yaln�z imzalamak i�in)\n"
+msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:946
-#, c-format
-msgid "   (%d) ElGamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (yaln�z �ifrelemek i�in)\n"
-
-#: 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:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) RSA (sadece imzalamak i�in)\n"
+msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) RSA (sadece �ifrelemek i�in)\n"
+msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:953
+#: g10/keygen.c:1175
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (imzalamak ve �ifrelemek i�in)\n"
+msgstr "   (%d) RSA (imzalamak ve şifrelemek için)\n"
 
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
 msgid "Your selection? "
-msgstr "Se�iminiz? "
-
-#: 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?"
+msgstr "Seçiminiz? "
 
-#: g10/keyedit.c:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
 msgid "Invalid selection.\n"
-msgstr "Se�im ge�ersiz.\n"
+msgstr "Seçim geçersiz.\n"
 
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1527,71 +1638,64 @@ msgid ""
 "              default keysize is 1024 bits\n"
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
-"Yeni bir %s anahtar �ifti �retmek �zeresiniz.\n"
-"                   en k���k anahtar uzunlu�u:  768 bit\n"
-"                  �ntan�ml� anahtar uzunlu�u: 1024 bit\n"
-"    �nerilebilecek en b�y�k anahtar uzunlu�u: 2048 bit\n"
+"Yeni bir %s anahtar çifti üretmek üzeresiniz.\n"
+"                   en küçük anahtar uzunluğu:  768 bit\n"
+"                  öntanımlı anahtar uzunluğu: 1024 bit\n"
+"    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
 
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
 msgid "What keysize do you want? (1024) "
-msgstr "�stedi�iniz anahtar uzunlu�u nedir? (1024) "
+msgstr "İstediğiniz anahtar uzunluğu nedir? (1024) "
 
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
 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"
+msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
 
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
 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"
+msgstr ""
+"anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
 
-#: g10/keygen.c:1030
+#: g10/keygen.c:1244
 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"
-
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
+
+#: g10/keygen.c:1255
 #, 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"
+msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1260
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
-"Hesaplama EPEYCE UZUN zaman alaca��ndan anahtar uzunluklar�nda\n"
-"2048 bitten fazlas� tavsiye edilmez.\n"
+"Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
+"2048 bitten fazlası tavsiye edilmez.\n"
 
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
 msgid "Are you sure that you want this keysize? "
-msgstr "Bu anahtar uzunlu�unu istedi�inizden emin misiniz? "
+msgstr "Bu anahtar uzunluğunu istediğinizden emin misiniz? "
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
-"Tamam, ama sald�r�lara �ok duyarl� olan monit�r ve klavye ���n�mlar�ndan "
+"Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
 "kendinizi uzak tutun! (ne demekse...)\n"
 
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "�stenen anahtar uzunlu�u: %u bit\n"
+msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
 #, c-format
 msgid "rounded up to %u bits\n"
-msgstr "%u bite yuvarland�\n"
+msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1600,14 +1704,14 @@ msgid ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"L�tfen anahtar�n ne kadar s�reyle ge�erli olaca��n� belirtin.\n"
-"         0 = anahtar s�resiz ge�erli\n"
-"      <n>  = anahtar n g�n ge�erli\n"
-"      <n>w = anahtar n hafta ge�erli\n"
-"      <n>m = anahtar n ay ge�erli\n"
-"      <n>y = anahtar n y�l ge�erli\n"
-
-#: g10/keygen.c:1126
+"Lütfen anahtarın ne kadar süreyle geçerli olacağını belirtin.\n"
+"         0 = anahtar süresiz geçerli\n"
+"      <n>  = anahtar n gün geçerli\n"
+"      <n>w = anahtar n hafta geçerli\n"
+"      <n>m = anahtar n ay geçerli\n"
+"      <n>y = anahtar n yıl geçerli\n"
+
+#: g10/keygen.c:1340
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1616,49 +1720,48 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"L�tfen imzan�nn ne kadar s�reyle ge�erli olaca��n� belirtin.\n"
-"         0 = imza s�resiz ge�erli\n"
-"      <n>  = imza n g�n ge�erli\n"
-"      <n>w = imza n hafta ge�erli\n"
-"      <n>m = imza n ay ge�erli\n"
-"      <n>y = imza n y�l ge�erli\n"
-
-#: g10/keygen.c:1148
+"Lütfen imzanınn ne kadar süreyle geçerli olacağını belirtin.\n"
+"         0 = imza süresiz geçerli\n"
+"      <n>  = imza n gün geçerli\n"
+"      <n>w = imza n hafta geçerli\n"
+"      <n>m = imza n ay geçerli\n"
+"      <n>y = imza n yıl geçerli\n"
+
+#: g10/keygen.c:1362
 msgid "Key is valid for? (0) "
-msgstr "Anahtar ne kadar ge�erli olacak? (0) "
+msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
 msgid "Signature is valid for? (0) "
-msgstr "�mza ne kadar ge�erli olacak? (0) "
+msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
 msgid "invalid value\n"
-msgstr "de�er hatal�\n"
+msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
 #, c-format
 msgid "%s does not expire at all\n"
-msgstr "%s hep ge�erli olacak\n"
+msgstr "%s hep geçerli olacak\n"
 
-#. print the date when the key expires
-#: g10/keygen.c:1167
+#: g10/keygen.c:1381
 #, c-format
 msgid "%s expires at %s\n"
-msgstr "%s %s sonra ge�ersiz olacak\n"
+msgstr "%s %s sonra geçersiz olacak\n"
 
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
-"Sisteminiz 2038 y�l�ndan sonraki tarihleri g�steremiyor.\n"
-"Ama emin olun ki 2106 y�l�na kadar elde edilebilecek.\n"
+"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:1178
+#: g10/keygen.c:1392
 msgid "Is this correct (y/n)? "
-msgstr "Bu do�ru mu? (e/h)? "
+msgstr "Bu doğru mu? (e/h)? "
 
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1668,1880 +1771,2253 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Anahtar�n�z�n size ait oldu�unu belirten bir Kullan�c�-Kimli�i olmal�;\n"
-"Kullan�c�-Kimli�i, Ger�ek �sminiz, Bir �nbilgi ve e-Posta Adresiniz\n"
-"alanlar�n�n bir birle�iminden olu�ur. �rne�in:\n"
+"Anahtarınızın size ait olduğunu belirten bir Kullanıcı-Kimliği olmalı;\n"
+"Kullanıcı-Kimliği, Gerçek İsminiz, Bir Önbilgi ve e-Posta Adresiniz\n"
+"alanlarının bir birleşiminden oluşur. Örneğin:\n"
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
 msgid "Real name: "
-msgstr "Ad�n�z ve Soyad�n�z: "
+msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
 msgid "Invalid character in name\n"
-msgstr "Ad ve soyad�n�zda ge�ersiz karakter var\n"
+msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
 msgid "Name may not start with a digit\n"
-msgstr "Ad ve soyad�n�z bir rakamla ba�lamamal�\n"
+msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
 msgid "Name must be at least 5 characters long\n"
-msgstr "Ad ve soyad�n�z en az 5 harfli olmal�\n"
+msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
 msgid "Not a valid email address\n"
-msgstr "ge�erli bir E-posta adresi de�il\n"
+msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
 msgid "Comment: "
-msgstr "�nbilgi: "
+msgstr "Önbilgi: "
 
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
 msgid "Invalid character in comment\n"
-msgstr "�nbilgi alan�nda ge�ersiz karakter var\n"
+msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "`%s' karakter k�mesini kullan�yorsunuz.\n"
+msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"Se�ti�iniz KULLANICI-K�ML���:\n"
+"Seçtiğiniz KULLANICI-KİMLİĞİ:\n"
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
 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"
+msgstr ""
+"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
 
-#: g10/keygen.c:1316
+#: g10/keygen.c:1531
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
 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)? "
+msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1327
+#: g10/keygen.c:1542
 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)? "
+msgstr ""
+"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1346
+#: g10/keygen.c:1561
 msgid "Please correct the error first\n"
-msgstr "L�tfen �nce hatay� d�zeltin\n"
+msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"Gizli anahtar�n�z� korumak i�in bir Anahtar Parolan�z olmal�.\n"
+"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
-"ikinci kez yazd���n�z anahtar parolas� ilkiyle ayn� de�il; i�lem "
+"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"Bir anahtar parolas� istemediniz - bu *k�t�* bir fikir!\n"
-"Nas�l isterseniz. Anahtar parolan�z� bu program� \"--edit-key\"\n"
-"se�ene�i ile kullanarak her zaman de�i�tirebilirsiniz.\n"
+"Bir anahtar parolası istemediniz - bu *kötü* bir fikir!\n"
+"Nasıl isterseniz. Anahtar parolanızı bu programı \"--edit-key\"\n"
+"seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
 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"
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
-"Bir miktar rasgele bayt �retilmesi gerekiyor. �lk �retim s�ras�nda biraz\n"
+"Bir miktar rasgele bayt üretilmesi gerekiyor. İlk üretim sırasında biraz\n"
 "hareket (klavyeyi kullanmak, fareyi hareket ettirmek, disklerden "
 "yararlanmak)\n"
-"iyi olacakt�r; bu yeterli rasgele bayt kazanmak i�in rasgele say�\n"
-"�retecine yard�mc� olur. \n"
+"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
+"üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "pardon, bu betik kipinde yapılamaz\n"
+
+#: g10/keygen.c:2267
 msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA anahtar �ifti 1024 bit olacak.\n"
+msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
 msgid "Key generation canceled.\n"
-msgstr "Anahtar �retimi durduruldu.\n"
+msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
 #, c-format
 msgid "writing public key to `%s'\n"
-msgstr "genel anahtar� `%s'e yaz�yor\n"
+msgstr "genel anahtarı `%s'e yazıyor\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2456 g10/keygen.c:2582
 #, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "gizli anahtar� `%s'e yaz�yor\n"
+msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
 #, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "yaz�labilir bir genel anahtar zinciri yok: %s\n"
+msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
 #, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "yaz�labilir bir gizli anahtar zinciri yok: %s\n"
+msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "`%s' genel anahtar zincirine yaz�l�rken hata olu�tu: %s\n"
+msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "`%s' gixli anahtar zincirine yaz�l�rken hata olu�tu: %s\n"
+msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
 msgid "public and secret key created and signed.\n"
-msgstr "genel ve gizli anahtar �retildi ve imzaland�.\n"
-
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "anahtar son derece g�venli olarak imlendi.\n"
+msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
 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 ""
-"Bu anahtar �ifreleme i�in kullan�lamaz. �ifreleme i�in ikinci bir anahtar�\n"
-"\"--edit-key\" se�ene�ini kullanarak �retebilirsiniz.\n"
+"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:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "Anahtar �retimi ba�ar�s�zl��a u�rad�: %s\n"
+msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
 #, 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"
+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:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
-"anahtar bundan %lu saniye sonra �retilmi� (zaman sapmas� veya saat "
+"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
 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"
+msgstr ""
+"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
 msgid "Really create? "
-msgstr "Ger�ekten olu�turulsun mu? "
+msgstr "Gerçekten oluşturulsun mu? "
 
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
 msgid "--output doesn't work for this command\n"
-msgstr "--output se�ene�i bu komutla �al��maz\n"
+msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
 #, c-format
 msgid "%s: can't open: %s\n"
-msgstr "%s: a��lam�yor: %s\n"
+msgstr "%s: açılamıyor: %s\n"
 
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "anahtar parolas� olu�turulurken hata: %s\n"
+msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encode.c:210
+#: g10/encode.c:208
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullan�lam�yor\n"
+msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "%s şifresi kullanılıyor\n"
+
+#: g10/encode.c:231 g10/encode.c:544
 #, c-format
 msgid "`%s' already compressed\n"
-msgstr "`%s' zaten s�k��t�r�lm��\n"
+msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
 #, c-format
 msgid "%s: WARNING: empty file\n"
-msgstr "%s: UYARI: dosya bo�\n"
+msgstr "%s: UYARI: dosya boş\n"
 
-#: g10/encode.c:406
+#: g10/encode.c:465
 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 "
+"--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
 "yapabilirsiniz\n"
 
-#: g10/encode.c:422
+#: g10/encode.c:480
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:456
-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:516
+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:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "al�c�n�n tercihleriyle �eli�en %s (%d) simetrik �ifre kullan�m� zorlan�yor\n"
+msgstr ""
+"alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:558 g10/sign.c:758
+#: g10/encode.c:634 g10/sign.c:863
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "al�c�n�n tercihleriyle �eli�en %s (%d) s�k��t�rma algoritmas� kullan�m� zorlan�yor\n"
-
-#: g10/encode.c:703
-#, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "%2$s kipindeyken %1$s kullan�lamaz.\n"
+msgstr ""
+"alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması kullanılmak "
+"isteniyor\n"
 
-#: g10/encode.c:735
+#: g10/encode.c:818
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s \"%s\" i�in �ifrelendi\n"
+msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "anahtar blo�u okunurken hata: %s\n"
+msgstr "anahtar bloğu okunurken hata: %s\n"
 
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "%08lX anahtar�: bir RFC2440 anahtar� de�il - atland�\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
-msgstr "%08lX anahtar�: korunmam�� - atland�\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:246
-#, 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:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "UYARI: gizli anahtar %08lX basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:347
+#: g10/export.c:385
 msgid "WARNING: nothing exported\n"
-msgstr "UYARI: hi�bir �ey d��ar� aktar�lmad�\n"
+msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/getkey.c:151
+#: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
-msgstr "pk belle�inde �ok fazla girdi - iptal edildi\n"
+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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
 msgid "[User id not found]"
-msgstr "[Kullan�c� kimli�i bulunamad�]"
+msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
-"Ge�ersiz %08lX anahtar� --allow-non-selfsigned-uid kullan�larak ge�erli "
+"Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli "
 "oldu\n"
 
-#: g10/getkey.c:2109
-#, 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:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr ""
+"yardımcı genel anahtar %08lX için bir gizli anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "%08lX anahtar�: genel anahtars�z gizli anahtar - atland�\n"
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/import.c:258
+#: g10/import.c:241
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "%d. t�r blok atland�\n"
+msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
-msgstr "�u ana kadar her�ey yolunda giderek %lu anahtar i�lenmi�\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "şu ana kadar herşey yolunda giderek %lu anahtar işlenmiş\n"
 
-#: g10/import.c:272
+#: g10/import.c:255
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/import.c:284
+#: g10/import.c:267
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "��lenmi� toplam miktar: %lu\n"
+msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:286
+#: g10/import.c:269
 #, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "     yeni anahtarlar atland�: %lu\n"
+msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:272
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "         kullan�c� kimliksiz: %lu\n"
+msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:274
 #, c-format
 msgid "              imported: %lu"
-msgstr "                   indirildi: %lu"
+msgstr "                      alınan: %lu"
 
-#: g10/import.c:297
+#: g10/import.c:280
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "                   de�i�medi: %lu\n"
+msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:282
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "      yeni kullan�c� kimli�i: %lu\n"
+msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:284
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "    yeni yard�mc� anahtarlar: %lu\n"
+msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:286
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:305
+#: g10/import.c:288
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:307
+#: g10/import.c:290
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:309
+#: g10/import.c:292
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:311
+#: g10/import.c:294
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "  gizli anahtarlar de�i�medi: %lu\n"
+msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:313
+#: g10/import.c:296
 #, c-format
 msgid "          not imported: %lu\n"
-msgstr "             al�namad�: %lu\n"
+msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
 #, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "anahtar %08lX: kullan�c� kimli�i yok\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
 
-#: g10/import.c:597
-#, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "anahtar %08lX: HKP yard�mc� anahtar bozulmas� giderildi\n"
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/import.c:612
+#: g10/import.c:576
 #, 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"
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s imzası, %s özümleme algoritması\n"
+
+#: g10/import.c:600
 #, c-format
-msgid "key %08lX: no valid user IDs\n"
-msgstr "anahtar %08lX: kullan�c� kimli�i ge�ersiz\n"
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
 
-#: g10/import.c:621
-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:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
 
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
-msgstr "anahtar %08lX: genel anahtar bulunamad�: %s\n"
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
 
-#: g10/import.c:636
+#: g10/import.c:639
 #, c-format
-msgid "key %08lX: new key - skipped\n"
-msgstr "anahtar %08lX: yeni anahtar - atland�\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
 
-#: g10/import.c:646
-#, c-format
-msgid "no writable keyring found: %s\n"
-msgstr "yaz�labilir bir anahtar zinciri yok: %s\n"
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
 
-#: g10/import.c:651 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:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "anahtar %08lX: HKP yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
-#, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "\"%s\" anahtar zincirine yazarken hata olu�tu: %s\n"
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: 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:663
-#, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "anahtar %08lX: genel anahtar \"%s\" al�nd�\n"
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "anahtar %08lX: kullanıcı kimliği geçersiz\n"
 
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
-msgstr "anahtar %08lX: bizim kopyam�zla e�le�miyor\n"
+#: g10/import.c:730
+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:702 g10/import.c:920
-#, 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:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:709 g10/import.c:926
-#, 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:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
 
-#: g10/import.c:740
+#: g10/import.c:755
 #, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "anahtar %08lX: \"%s\" 1 yeni kullan�c� kimli�i\n"
+msgid "no writable keyring found: %s\n"
+msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:743
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
 #, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "anahtar %08lX: \"%s\" %d yeni kullan�c� kimli�i\n"
+msgid "writing to `%s'\n"
+msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:746
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
 #, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
+msgid "error writing keyring `%s': %s\n"
+msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
+
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "anahtar %08lX: genel anahtar \"%s\" alındı\n"
+
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "anahtar %08lX: bizim kopyamızla eşleşmiyor\n"
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "anahtar %08lX: özgün anahtar bloku bulunamadı: %s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "anahtar %08lX: özgün anahtar bloku okunamadı: %s\n"
+
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "anahtar %08lX: \"%s\" 1 yeni kullanıcı kimliği\n"
+
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "anahtar %08lX: \"%s\" %d yeni kullanıcı kimliği\n"
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %08lX: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:749
-#, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:752
-#, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "anahtar %08lX: %s 1 yeni yard�mc� anahtar\n"
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "anahtar %08lX: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:755
-#, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "anahtar %08lX: \"%s\" %d yeni yard�mc� anahtar\n"
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "anahtar %08lX: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:774
-#, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "anahtar %08lX: \"%s\" de�i�medi\n"
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "anahtar %08lX: \"%s\" değişmedi\n"
+
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "%08lX anahtarı: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:844
+#: g10/import.c:1064
 #, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "�ntan�ml� gizli anahtar zinciri yok: %s\n"
+msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
 msgstr "anahtar %08lX: gizli anahtar indirildi\n"
 
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
-msgstr "anahtar %08lX: gizli anahtar bulunamad�: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
 
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"anahtar %08lX: genel anahtar de�il - y�r�rl�kten kald�rma sertifikas� "
+"anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:937
-#, 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:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:969
-#, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "anahtar %08lX: \"%s\" y�r�rl�kten kald�rma sertifikas� al�nd�\n"
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1017
-#, 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:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "anahtar %08lX: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
-"anahtar %08lX: genel anahtar algoritmas�, kullan�c� kimli�i \"%s\" i�in "
+"anahtar %08lX: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1032
-#, 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:1047
-#, 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:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
-msgstr "anahtar %08lX: genel anahtar algoritmas� desteklenmiyor\n"
-
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr "anahtar %08lX: yard�mc� anahtar garantileme ge�ersiz\n"
-
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
-#, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "anahtar %08lX: �ok say�da yard�mc� anahtar ba�lant�s� silindi\n"
-
-#: g10/import.c:1088
-#, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "anahtar %08lX: anahtar� y�r�rl�kten kald�rmak i�in yard�mc� anahtar yok\n"
-
-#: g10/import.c:1097
-#, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "anahtar %08lX: yard�mc� anahtar y�r�rl�kten kald�rmas� ge�ersiz\n"
-
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
-#, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "anahtar %08lX: �ok say�da yard�mc� anahtar y�r�rl�kten kald�rmas� silindi\n"
-
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
-msgstr "anahtar %08lX: kullan�c� kimli�i atland�: '"
-
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
-msgstr "anahtar %08lX: yard�mc� anahtar atland�\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: 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:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n"
+
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n"
+
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
+
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "anahtar %08lX: çok sayıda yardımcı anahtar bağlantısı silindi\n"
+
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr ""
+"anahtar %08lX: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, 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:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1203
-#, 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:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr ""
+"anahtar %08lX: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1220
-#, 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:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
 
-#: g10/import.c:1232
-#, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "anahtar %08lX: yard�mc� anahtar imzas� yanl�� yerde - atland�\n"
-
-#: g10/import.c:1330
-#, 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:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
+
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "anahtar %08lX: imza gönderilebilir değil (%02x sınıfı) - atlandı\n"
+
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1389
-#, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
+
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "anahtar %08lX: yardımcı anahtar imzası yanlış yerde - atlandı\n"
+
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "anahtar %08lX: umulmayan imza sınıfı (0x%02X) - atlandı\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "anahtar %08lX: çift kullanıcı kimliği saptandı - katıştırıldı\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"UYARI: anahtar %08lX y�r�rl�kten kald�r�lm�� olmal�: y�r�rl�kten kald�rma "
-"anahtar� %08lX al�n�yor\n"
+"UYARI: 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:1403
-#, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"UYARI: anahtar %08lX y�r�rl�kten kald�r�lm�� olabilir: y�r�rl�kten kald�rma "
-"anahtar� %08lX mevcut de�il.\n"
+"UYARI: 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:1460
-#, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "anahtar %08lX: \"%s\" y�r�rl�kten kald�rma sertifikas� eklendi\n"
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
-msgstr "anahtar %08lX: do�rudan anahtar imzas� eklendi\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
 
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
 msgid "[revocation]"
-msgstr "[y�r�rl�kten kald�rma]"
+msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
 msgid "[self-signature]"
-msgstr "[�z-imza]"
+msgstr "[öz-imza]"
 
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
 msgid "1 bad signature\n"
-msgstr "1 k�t� imza\n"
+msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "%d k�t� imza\n"
+msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
 msgid "1 signature not checked due to a missing key\n"
-msgstr "1 imza kay�p bir anahtar y�z�nden kontrol edilmedi\n"
+msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
 #, 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"
+msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
 msgid "1 signature not checked due to an error\n"
-msgstr "1 imza bir hata y�z�nden kontrol edilmedi\n"
+msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "%d imza hatalardan dolay� kontrol edilmedi\n"
+msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "1 �z-imzas� ge�ersiz kullan�c� kimli�i saptand�\n"
+msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "%d �z-imzas� ge�ersiz kullan�c� kimli�i saptand�\n"
+msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = Şöyle böyle güveniyorum\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = Tamamen güveniyorum\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "Kullan�c� kimli�i \"%s\" y�r�rl�kten kald�r�ld�."
+msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
 msgid "  Unable to sign.\n"
-msgstr "  �mzalanam�yor.\n"
+msgstr "  İmzalanamıyor.\n"
+
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:380
+#: g10/keyedit.c:545
 #, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "UYARI: kullan�c� kimli�i \"%s\" �z-imzal� de�il.\n"
+msgid "User ID \"%s\" is not self-signed."
+msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:399
+#: g10/keyedit.c:584
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"\"%s\" �zerindeki �z-imza\n"
-"bir PGP 2.x tarz� imza.\n"
+"\"%s\" üzerindeki öz-imza\n"
+"bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:593
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "Bir OpenPGP �z-imzas� haline getirilmesini istiyor musunuz? (e/H) "
+msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"\"%s\" üzerindeki imzanızın\n"
+"kullanım süresi dolmuş.\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
+
+#: g10/keyedit.c:632
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
-"\"%s\" �zerindeki imzan�z\n"
+"\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
 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) "
+msgstr ""
+"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:446
-#, 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:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" zaten %08lX anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
-msgstr "\"%s\" zaten %08lX anahtar�yla imzalanm��\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
-msgstr "%08lX anahtar� ile imzalanacak hi�bir �ey yok\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
 msgid "This key has expired!"
-msgstr "Bu anahtar�n kullan�m s�resi dolmu�!"
+msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
 #, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Bu anahtar�n ge�erlili�i %s de bitiyor.\n"
+msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
 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) "
+msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
-"--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzas� "
+"--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:761
 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"
+msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
 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 ""
-"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"
+"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:564
+#: g10/keyedit.c:791
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr "   (0) Cevab� bilmiyorum. %s\n"
+msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr "   (2) �li�kisel denetim yapt�m.%s\n"
+msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr "   (3) �ok dikkatli bir denetim yapt�m.%s\n"
+msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Seçiminiz? (bilgi için '?' giriniz): "
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:826
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
-"Bu anahtar� kendi anahtar�n�zla imzalamak istedi�inize ger�ekten\n"
+"Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:835
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr ""
 "\n"
-"Bu bir �z-imza olacak.\n"
+"Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:839
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"UYARI: imza d��ar� g�nderilemez olarak imlenmeyecek.\n"
+"UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:844
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"UYARI: imza y�r�rl�kten kald�r�lamaz olarak imlenmeyecek.\n"
+"UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"�mza d��ar� g�nderilemez olarak imlenecek.\n"
+"İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"�mza y�r�rl�kten kald�r�lamaz olarak imlenecek.\n"
+"İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 "\n"
-"Her �eyiyle bu anahtar� kontol edemedim.\n"
+"Her şeyiyle bu anahtarı kontrol edemedim.\n"
 
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 "\n"
-"Bu anahtar� kar��la�t�rmal� kontrol ettim.\n"
+"Bu anahtarı karşılaştırmalı kontrol ettim.\n"
 
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
-"Bu anahtar� �ok dikkatli kontrol ettim.\n"
+"Bu anahtarı çok dikkatli kontrol ettim.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
 msgid "Really sign? "
-msgstr "Ger�ekten imzalayacak m�s�n�z? "
+msgstr "Gerçekten imzalayacak mısınız? "
 
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "imzalama ba�ar�s�z: %s\n"
+msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
 msgid "This key is not protected.\n"
-msgstr "Bu anahtar korunmam��.\n"
+msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
 msgid "Secret parts of primary key are not available.\n"
-msgstr "As�l anahtar�n gizli par�alar� kullan�lamaz.\n"
+msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
 msgid "Key is protected.\n"
-msgstr "Anahtar korunmu�.\n"
+msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
 #, c-format
 msgid "Can't edit this key: %s\n"
-msgstr "Bu anahtar �zerinde d�zenleme yap�lamaz: %s\n"
+msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"Bu gizli anahtar i�in yeni anahtar parolas�n� giriniz.\n"
+"Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"Bir anahtar parolas� vermediniz - bu �ok *k�t�* bir fikir!\n"
+"Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
 msgid "Do you really want to do this? "
-msgstr "Ger�ekten bunu yapmak istiyor musunuz? "
+msgstr "Gerçekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
 msgid "moving a key signature to the correct place\n"
-msgstr "bir anahtar imzas� do�ru yere ta��n�yor\n"
+msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
 msgid "quit this menu"
-msgstr "bu men�den ��k"
+msgstr "bu menüden çık"
 
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
 msgid "q"
 msgstr "k"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save"
-msgstr "kaydet"
+msgstr "save"
 
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
 msgid "save and quit"
-msgstr "kaydet ve ��k"
+msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "help"
-msgstr "yard�m"
+msgstr "help"
 
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
 msgid "show this help"
-msgstr "bunu g�sterir "
+msgstr "bunu gösterir "
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "fpr"
-msgstr "piz"
+msgstr "fpr"
 
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
 msgid "show fingerprint"
-msgstr "parmak izini g�ster"
+msgstr "parmak izini gösterir"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list"
-msgstr "listele"
+msgstr "list"
 
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
 msgid "list key and user IDs"
-msgstr "anahtar� ve kullan�c� kimli�ini g�ster"
+msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "uid"
-msgstr "kullkim"
+msgstr "uid"
 
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
 msgid "select user ID N"
-msgstr "N kullan�c� kimli�ini se�er"
+msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "key"
-msgstr "anahtar"
+msgstr "key"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
 msgid "select secondary key N"
-msgstr "N yard�mc� anahtar�n� se�er"
+msgstr "N yardımcı anahtarını seçer"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "check"
-msgstr "kontrol"
+msgstr "check"
 
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
 msgid "list signatures"
-msgstr "imzalar� listele"
+msgstr "imzaları listeler"
 
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign"
-msgstr "imzala"
+msgstr "sign"
 
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
 msgid "sign the key"
-msgstr "anahtar� imzalar"
+msgstr "anahtarı imzalar"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
 msgid "s"
 msgstr "i"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "bağımsız bir imza yapar"
+
+#: g10/keyedit.c:1153
 msgid "lsign"
-msgstr "yimza"
+msgstr "lsign"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
 msgid "sign the key locally"
-msgstr "anahtar� yerel olarak imzala"
+msgstr "anahtarı yerel olarak imzala"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "nrsign"
-msgstr "yks�zimza"
+msgstr "nrsign"
 
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
 msgid "sign the key non-revocably"
-msgstr "y�r�rl�kten kald�r�lamayan imza"
+msgstr "yürürlükten kaldırılamayan imza yapar"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "nrlsign"
-msgstr "i�yks�zimza"
+msgstr "nrlsign"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
 msgid "sign the key locally and non-revocably"
-msgstr "y�r�rl�kten kald�r�lamayan yerel imza"
+msgstr "yürürlükten kaldırılamayan yerel imza yapar"
 
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
 msgid "debug"
-msgstr "hata ay�klama"
+msgstr "debug"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "adduid"
-msgstr "kullkimEkle"
+msgstr "adduid"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
 msgid "add a user ID"
-msgstr "bir kullan�c� kimli�i ekler"
+msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "addphoto"
-msgstr "fotoekle"
+msgstr "addphoto"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
 msgid "add a photo ID"
-msgstr "bir foto kimli�i ekler"
+msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "deluid"
-msgstr "kullkimSil"
+msgstr "deluid"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
 msgid "delete user ID"
-msgstr "kullan�c� kimli�ini siler"
+msgstr "kullanıcı kimliğini siler"
 
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
 msgid "delphoto"
-msgstr "fotosil"
+msgstr "delphoto"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "addkey"
-msgstr "anhEkle"
+msgstr "addkey"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
 msgid "add a secondary key"
-msgstr "bir yard�mc� anahtar ekler"
+msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delkey"
-msgstr "anhSil"
+msgstr "delkey"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
 msgid "delete a secondary key"
-msgstr "bir yard�mc� anahtar siler"
+msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 msgid "addrevoker"
-msgstr "iptalEkle"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:1164
 msgid "add a revocation key"
-msgstr "bir y�r�rl�kten kald�rma anahtar� ekler"
+msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delsig"
-msgstr "imzaSil"
+msgstr "delsig"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
 msgid "delete signatures"
-msgstr "imzalar� siler"
+msgstr "imzaları siler"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "expire"
-msgstr "sontarih"
+msgstr "expire"
 
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
 msgid "change the expire date"
-msgstr "son kullan�m tarihini de�i�tirir"
+msgstr "son kullanım tarihini değiştirir"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "primary"
-msgstr "as�l"
+msgstr "primary"
 
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
 msgid "flag user ID as primary"
-msgstr "kullan�c� kimli�ini as�l olarak imler"
+msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle"
-msgstr "se�mece"
+msgstr "toggle"
 
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
 msgid "toggle between secret and public key listing"
-msgstr "genel ve gizli anahtar listeleri aras�nda yer de�i�tirir"
+msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
 msgid "t"
 msgstr "b"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "pref"
-msgstr "�nayar"
+msgstr "pref"
 
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "showpref"
-msgstr "tercihg�st"
+msgstr "showpref"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
 msgid "list preferences (verbose)"
-msgstr "tercihleri listeler (ayr�nt�l�)"
+msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "setpref"
-msgstr "tercihyap"
+msgstr "setpref"
 
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
 msgid "set preference list"
-msgstr "tercih listesi olu�turmak i�in"
+msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updpref"
-msgstr "tercg�ncel"
+msgstr "updpref"
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
 msgid "updated preferences"
-msgstr "g�ncelenmi� tercihler"
+msgstr "güncelenmiş tercihler"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "anahtar sunucusu hatası"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
+
+#: g10/keyedit.c:1176
 msgid "passwd"
-msgstr "aparola"
+msgstr "passwd"
 
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
 msgid "change the passphrase"
-msgstr "anahtar parolas�n� de�i�tirir"
+msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "trust"
-msgstr "g�vence"
+msgstr "trust"
 
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
 msgid "change the ownertrust"
-msgstr "sahibining�vencesini de�i�tirir"
+msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revsig"
-msgstr "imzay�rkal"
+msgstr "revsig"
 
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
 msgid "revoke signatures"
-msgstr "imzalar� y�r�rl�kten kald�r�r"
+msgstr "imzaları yürürlükten kaldırır"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "bir kullanıcı kimliği yürürlükten kaldırır"
+
+#: g10/keyedit.c:1180
 msgid "revkey"
-msgstr "y�rkalanh"
+msgstr "revkey"
 
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
 msgid "revoke a secondary key"
-msgstr "bir yard�mc� anahtar� y�r�rl�kten kald�r�r"
+msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable"
-msgstr "iptal"
+msgstr "disable"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
 msgid "disable a key"
-msgstr "bir anahtar� iptal eder"
+msgstr "bir anahtarı iptal eder"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable"
-msgstr "kullan"
+msgstr "enable"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
 msgid "enable a key"
-msgstr "bir anahtar� kullan�ma sokar"
+msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "showphoto"
-msgstr "fotog�st"
+msgstr "showphoto"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
 msgid "show photo ID"
-msgstr "foto kimli�ini g�sterir"
+msgstr "foto kimliğini gösterir"
 
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
 msgid "can't do that in batchmode\n"
-msgstr "bu �nceden belirlenmi� i�lemler kipinde (in batchmode) yap�lamaz\n"
+msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "gizli anahtar blo�u `%s' okunurken hata olu�tu: %s\n"
+msgstr "gizli anahtar bloğu `%s' okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
 msgid "Need the secret key to do this.\n"
-msgstr "Bunu yapmak i�in gizli anahtar gerekli.\n"
+msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
 msgid "Please use the command \"toggle\" first.\n"
-msgstr "l�tfen �nce \"se�mece\" komutunu kullan�n.\n"
+msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
 msgid "Key is revoked."
-msgstr "Anahtar y�r�rl�kten kald�r�ld�."
+msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
 msgid "Really sign all user IDs? "
-msgstr "T�m kullan�c� kimlikleri ger�ekten imzalanacak m�? "
+msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "�pucu: �mzalamak i�in bir kullan�c� kimli�i se�iniz\n"
+msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr "%s kipindeyken bu komut kullan�lamaz.\n"
+msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
 msgid "You must select at least one user ID.\n"
-msgstr "En az bir kullan�c� kimli�i se�melisiniz.\n"
+msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
 msgid "You can't delete the last user ID!\n"
-msgstr "Son kullan�c� kimli�ini silemezsiniz!\n"
+msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
 msgid "Really remove all selected user IDs? "
-msgstr "Se�ilen t�m kullan�c� kimlikleri ger�ekten silinecek mi? "
+msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
 msgid "Really remove this user ID? "
-msgstr "Bu kullan�c� kimli�i ger�ekten silinecek mi? "
+msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
 msgid "You must select at least one key.\n"
-msgstr "En az bir anahtar se�melisiniz.\n"
+msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
 msgid "Do you really want to delete the selected keys? "
-msgstr "Se�ilen anahtarlar� ger�ekten silmek istiyor musunuz? "
+msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
 msgid "Do you really want to delete this key? "
-msgstr "Bu anahtar� ger�ekten silmek istiyor musunuz? "
+msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "Bu kullanıcı kimliği gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1534
 msgid "Do you really want to revoke the selected keys? "
-msgstr "Se�ilen anahtarlar� ger�ekten y�r�rl�kten kald�rmak istiyor musunuz? "
+msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
 msgid "Do you really want to revoke this key? "
-msgstr "Bu anahtar� ger�ekten y�r�rl�kten kald�rmak istiyor musunuz? "
+msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "tercih listesi oluşturmak için"
+
+#: g10/keyedit.c:1612
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
-"Se�ilen kullan�c� kimlik i�in tercihleri ger�ekten g�ncellemek istiyor "
+"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
 "musunuz? "
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
 msgid "Really update the preferences? "
-msgstr "Tercihleri ger�ekten g�ncellemek istiyor musunuz? "
+msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
 msgid "Save changes? "
-msgstr "De�i�iklikler kaydedilecek mi? "
+msgstr "Değişiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
 msgid "Quit without saving? "
-msgstr "Kaydetmeden ��k�ls�n m�? "
+msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
 #, c-format
 msgid "update failed: %s\n"
-msgstr "g�ncelleme ba�ar�s�z: %s\n"
+msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "gizliyi g�ncelleme ba�ar�s�z: %s\n"
+msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
 msgid "Key not changed so no update needed.\n"
-msgstr "G�ncelleme gere�i olmad���ndan anahtar de�i�medi.\n"
+msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Komut ge�ersiz (\"yard�m\" komutunu deneyin)\n"
+msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "Özümlenen: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "Özellikler: "
 
-#: g10/keyedit.c:1750
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
 #, c-format
 msgid "This key may be revoked by %s key "
-msgstr "Bu anahtar %s taraf�ndan bu anahtarla y�r�rl�kten kald�r�lm�� olabilir: "
+msgstr ""
+"Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
 msgid " (sensitive)"
-msgstr " (duyarl�)"
+msgstr " (duyarlı)"
 
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, 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:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "%s oluşturulamıyor: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[yürürlükten kaldırıldı] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr "[son kullanma tarihi: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " güvencesi: %c/%c"
+
+#: g10/keyedit.c:2107
 #, c-format
-msgid " trust: %c/%c"
-msgstr " g�ven derecesi: %c/%c"
+msgid "validity: %s"
+msgstr ""
 
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2114
 msgid "This key has been disabled"
-msgstr "Bu anahtar iptal edilmi�ti"
+msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
 #, 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"
+msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
 
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
 msgid "rev- faked revocation found\n"
-msgstr "y�rkal- sahte y�r�rl�kten kald�rma sertifikas� bulundu\n"
+msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
 
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr "y�rkal? Y�r�rl�kten kald�rma denetlenirken problem: %s\n"
+msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "Bir PGP 2.x tarz� kullan�c� kimli�ine uygun tercih yok.\n"
+msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2207
 msgid ""
 "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, gerekli\n"
-"do�rulukta olmayaca��n� l�tfen g�z�n�ne al�n�z.\n"
+"Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
+"doğrulukta olmayacağını lütfen gözönüne alınız.\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[süresi doldu] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"UYARI: birincil olarak imli bir kullanıcı kimliği yok. Bu komut\n"
+"       başka bir kullanıcı kimliğinin birincil varsayılmasına sebep "
+"olabilir.\n"
+
+#: g10/keyedit.c:2399
 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 ""
-"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"
+"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:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
 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"
+msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
 msgid "Delete this good signature? (y/N/q)"
-msgstr "Bu do�ru imza silinsin mi? (e/H/k)"
+msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "Bu ge�ersiz imza silinsin mi? (e/H/k)"
+msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
 msgid "Really delete this self-signature? (y/N)"
-msgstr "Bu �z-imza ger�ekten silinecek mi? (e/H)"
+msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
 msgid "Nothing deleted.\n"
-msgstr "Hi�bir �ey silinmedi.\n"
+msgstr "Hiçbir şey silinmedi.\n"
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"UYARI: Bu PGP-2 tarzı bir anahtar. Tasarlanmış bir yürürlükten kaldırıcı\n"
+"       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
+"       ile sonuçlanabilir.\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr ""
+"PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
+"ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2703
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Tasarlanan y�r�rl�kten kald�rma anahtar�n�n kullan�c� kimli�ini giriniz: "
+msgstr ""
+"Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
-"bir PGP 2.x tarz� anahtar bir tasarlanm�� y�r�rl�kten kald�rma anahtar� olarak "
-"atanamaz\n"
+"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
+"olarak atanamaz\n"
 
-#. 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:2306
+#: g10/keyedit.c:2741
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "bir anahtar� kendisini y�r�rl�kten kald�racak anahtar olarak kullanamazs�n�z\n"
+msgstr ""
+"bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
+"kullanamazsınız\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr ""
+"UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
+"       kullanılamaz!\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr ""
+"bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
+"misiniz? (e/H): "
 
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2849
 msgid "Please remove selections from the secret keys.\n"
-msgstr "L�tfen gizli anahtarlardan se�ilenleri silin.\n"
+msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
 msgid "Please select at most one secondary key.\n"
-msgstr "L�tfen en fazla bir yard�mc� anahtar se�in.\n"
+msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
 msgid "Changing expiration time for a secondary key.\n"
-msgstr "Bir yard�mc� anahtar i�in son kullanma tarihi de�i�tiriliyor.\n"
+msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
 msgid "Changing expiration time for the primary key.\n"
-msgstr "As�l anahtar i�in son kullanma tarihi de�i�tiriliyor.\n"
+msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
 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"
+msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:2463
+#: g10/keyedit.c:2924
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
 msgid "Please select exactly one user ID.\n"
-msgstr "L�tfen sadece ve sadece bir kullan�c� kimlik se�iniz.\n"
+msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "kullan�c� kimli�i \"%s\" i�in v3 �z-imzas� atlan�yor\n"
+msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "%d endeksine sahip kullan�c� kimli�i yok\n"
+msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
 #, c-format
 msgid "No secondary key with index %d\n"
-msgstr "%d endeksine sahip yard�mc� anahtar yok\n"
+msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
 msgid "user ID: \""
-msgstr "Kullan�c� kimli�i: \""
+msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
-" %08lX anahtar�n�zla %s de imzaland�\n"
+" %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
 msgid ""
 "\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
 msgstr ""
 "\"\n"
-"%08lX anahtar�n�zla %s de yerel olarak imzal�\n"
+"%08lX anahtarınızla %s de yerel olarak imzalı\n"
 
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
 #, c-format
 msgid "This signature expired on %s.\n"
-msgstr "Bu anahtar�n ge�erlili�i %s de bitti.\n"
+msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
 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) "
+msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
 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) "
+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:2956
+#: g10/keyedit.c:3537
 msgid "You have signed these user IDs:\n"
-msgstr "Bu kullan�c� kimliklerini imzalam��s�n�z:\n"
+msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:2975
-#, c-format
-msgid "   signed by %08lX at %s%s%s\n"
-msgstr "   %08lX ile %s%s%s de imzalanm��\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   %08lX ile %s%s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2983
-#, 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:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
 msgid "You are about to revoke these signatures:\n"
-msgstr "Bu imzalar� y�r�rl�kten kald�rmak �zeresiniz:\n"
+msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:3013
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
-msgstr "   %08lX ile %s%s de imzalanm��\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
 msgid " (non-exportable)"
-msgstr " (d��arda ge�ersiz)"
+msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
 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) "
+msgstr ""
+"Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
 #, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (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"
+"Anahtar 0x%3$08lX (kull-kiml %4$d) için %2$ld uzunluktaki %1$s foto kimliği "
+"gösteriliyor\n"
 
-#: g10/keylist.c:91
+#: g10/keylist.c:179
 msgid "Critical signature policy: "
 msgstr "Kritik imza guvencesi: "
 
-#: g10/keylist.c:93
+#: g10/keylist.c:181
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
 msgid "WARNING: invalid notation data found\n"
-msgstr "UYARI: ge�ersiz niteleme verisi bulundu\n"
+msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
 
-#: g10/keylist.c:127
+#: g10/keylist.c:286
 msgid "Critical signature notation: "
 msgstr "Kritik imza niteleyici: "
 
-#: g10/keylist.c:129
+#: g10/keylist.c:288
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:136
+#: g10/keylist.c:299
 msgid "not human readable"
-msgstr "insan okuyabilir de�il"
+msgstr "insan okuyabilir değil"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:400
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr "[son kullanma tarihi: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
 #, c-format
 msgid " [expires: %s]"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:1001
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[yürürlükten kaldırıldı] "
+
+#: g10/keylist.c:1357
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1003
+#: g10/keylist.c:1359
 msgid "     Subkey fingerprint:"
-msgstr "Yard�mc� anahtar parmak izi:"
+msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1010
+#: g10/keylist.c:1366
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1012
+#: g10/keylist.c:1368
 msgid "      Subkey fingerprint:"
-msgstr "Yard�mc� anahtar parmak izi:"
+msgstr "Yardımcı anahtar parmak izi:"
 
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid "     Key fingerprint ="
-msgstr "        Anahtar parmak izi ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr "     Anahtar parmak izi ="
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr "bir �ifreli oturum anahtar� (%d) i�in tuhaf uzunluk\n"
+msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:258
+#: g10/mainproc.c:262
 #, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "ge�ersiz symkey algoritmas� saptand� (%d)\n"
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "anahtar parolası yanlış ya da bilinmeyen şifre algoritması (%d)\n"
 
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s şifreli oturum anahtarı\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
-msgstr "%s �ifreli veri\n"
+msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "bilinmeyen algoritma %d ile �ifrelenmi�\n"
+msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
 
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
 msgstr "genel anahtar: %08lX\n"
 
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "genel anahtarla �ifreli veri: do�ru DEK\n"
+msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
-"%u bitlik %s anahtar� ve kullan�c� kimli�i\n"
-"%08lX ile �ifrelendi, %s olu�turuldu\n"
+"%u bitlik %s anahtarı ve kullanıcı kimliği\n"
+"%08lX ile şifrelendi, %s oluşturuldu\n"
 
-#: g10/mainproc.c:425
-#, 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:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "%s anahtarı ve %08lX kullanıcı kimliği ile şifrelendi\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "genel anahtar �ifre ��z�m� ba�ar�s�z: %s\n"
+msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "%lu anahtar parolası ile şifreli\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "1 anahtar parolası ile şifreli\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
 #, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "%s �ifreli veri varsay�l�yor\n"
+msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
 #, 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"
+msgstr ""
+"IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
 msgid "decryption okay\n"
-msgstr "�ifre ��zme tamam\n"
+msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "UYARI: ileti bütünlük korumalı değildi\n"
+
+#: g10/mainproc.c:587
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "UYARI: �ifreli ileti tahrip edilmi�!\n"
+msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "�ifre ��zme ba�ar�s�z: %s\n"
+msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "B�LG�: g�nderen \"yaln�z-g�zleriniz-i�in\" ricas�nda bulundu\n"
+msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
 #, c-format
 msgid "original file name='%.*s'\n"
-msgstr "�zg�n dosya ad� = '%.*s'\n"
+msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
 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:780
-msgid "Notation: "
-msgstr "Niteleme: "
-
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "G�vence: "
+msgstr ""
+"tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
 msgid "signature verification suppressed\n"
-msgstr "imza do�rulama engellendi\n"
+msgstr "imza doğrulama engellendi\n"
 
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
 msgid "can't handle these multiple signatures\n"
-msgstr "bu �oklu imzalar elde edilemiyor\n"
+msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1310
-#, 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:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "Bu imzanın geçerliliği %s de bitti.\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                den \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "%.*s imzası, %s anahtarı ve %08lX kullanıcı kimliği ile yapılmış\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "Anahtar burada: "
 
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
 msgid "BAD signature from \""
-msgstr "K�T� imza: \""
+msgstr "KÖTÜ imza: \""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
 msgid "Expired signature from \""
-msgstr "Kullan�m tarihi ge�mi� imza: \""
+msgstr "Kullanım tarihi geçmiş imza: \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
 msgid "Good signature from \""
-msgstr "Do�ru imza: \""
+msgstr "Kullanıcı kimliği: \""
 
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
 msgid "[uncertain]"
-msgstr "[��pheli]"
+msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
 msgid "                aka \""
 msgstr "                den \""
 
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Bu imzanın geçerliliği %s de bitti.\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s imzası, %s özümleme algoritması\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "ikili"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "metinkipi"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "bilinmeyen"
+
+#: g10/mainproc.c:1668
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "�mza kontrol edilemedi: %s\n"
+msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
 msgid "not a detached signature\n"
-msgstr "bir ba��ms�z imza de�il\n"
+msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
+
+#: g10/mainproc.c:1787
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "0x%02x s�n�f� tek ba��na imza\n"
+msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr "proc_tree() i�inde ge�ersiz k�k paket saptand�\n"
+msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:82
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "\"core\" olu�umu iptal edilemedi: %s\n"
+msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
 
-#: g10/misc.c:162
+#: g10/misc.c:146
 msgid "Experimental algorithms should not be used!\n"
-msgstr "Deneysel algoritmalar kullan�lmamal�!\n"
+msgstr "Deneysel algoritmalar kullanılmamalı!\n"
 
-#: g10/misc.c:192
+#: g10/misc.c:176
 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"
+msgstr ""
+"bu şifre algoritması standart dışı; lütfen daha standart birini kullanın!\n"
 
-#: g10/misc.c:300
+#: g10/misc.c:282
 msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA �ifre eklentisi yok\n"
+msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:301
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:283
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
-"Daha fazla bilgi i�in l�tfen http://www.gnupg.org/why-not-idea.html "
+"Daha fazla bilgi için lütfen http://www.gnupg.org/why-not-idea.html "
 "adresine\n"
-"bak�n�z.\n"
+"bakınız.\n"
 
-#: g10/misc.c:509
+#: g10/misc.c:491
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d: \"%s\" se�ene�i kullan�mdan kald�r�lmak �zere.\n"
+msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:513
+#: g10/misc.c:495
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "UYARI: %s se�ene�i kullan�mdan kald�r�lmak �zere.\n"
+msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:515
+#: g10/misc.c:497
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "l�tfen yerine \"%s%s\" kullan�n�z\n"
+msgstr "lütfen yerine \"%s%s\" kullanınız\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "Sıkıştırılmamış"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "Sıkıştırılmamış"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "bu ileti %s tarafından kullanılamayabilir\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "\"%s\"den seçenekler okunuyor\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "öntanımlı alıcı `%s' bilinmiyor\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"
+msgstr "%d genel anahtar algoritması kullanılamadı\n"
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1065
+#: g10/parse-packet.c:1128
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "%d tipi alt paket kritik bit k�mesine sahip\n"
+msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
 msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent bu oturumda kullan�lamaz\n"
+msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
 msgid "can't set client pid for the agent\n"
 msgstr "istemci pid'i belirlenemiyor\n"
 
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
 msgid "can't get server read FD for the agent\n"
-msgstr "sunucu okuma dosya tan�t�c�s� al�namad�\n"
+msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n"
 
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
 msgid "can't get server write FD for the agent\n"
-msgstr "sunucu yazma dosya tan�t�c�s� al�namad�\n"
+msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n"
 
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "GPG_AGENT_INFO �evre de�i�keni hatal�\n"
+msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "gpg-agent protokol� s�r�m %d desteklenmiyor\n"
+msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
 #, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "\"%s\" sunucusuna ba�lan�lamad�: %s\n"
+msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
 msgid "communication problem with gpg-agent\n"
-msgstr "gpg-agent ile haberle�me problemi\n"
+msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
 msgid "problem with the agent - disabling agent use\n"
-msgstr "vekil ile problem - vekil kullan�m� iptal ediliyor\n"
+msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
 #, c-format
 msgid " (main key ID %08lX)"
-msgstr " (as�l anahtar kimli�i %08lX)"
+msgstr " (asıl anahtar kimliği %08lX)"
 
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -3549,561 +4025,651 @@ msgid ""
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
 "\"%.*s\"\n"
-"kullan�c�s�n�n gizli anahtar�n� a�acak bir anahtar parolas�na ihtiya� var.\n"
-"%u bitlik %s anahtar�, kimlik %08lX, olu�turulan %s%s\n"
+"kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
+"%u bitlik %s anahtarı, kimlik %08lX, oluşturulan %s%s\n"
 
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "Anahtar parolas�n� giriniz\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
 msgid "Repeat passphrase\n"
-msgstr "Parolay� tekrar yaz�n�z\n"
+msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "Anahtar parolasını giriniz\n"
+
+#: g10/passphrase.c:753
 msgid "passphrase too long\n"
-msgstr "Parola �ok uzun\n"
+msgstr "Parola çok uzun\n"
 
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
 msgid "invalid response from agent\n"
-msgstr "yan�t ge�ersiz\n"
+msgstr "yanıt geçersiz\n"
 
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
 msgid "cancelled by user\n"
-msgstr "kullan�c� taraf�ndan durduruldu\n"
+msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "vekil ile sorun var: vekil 0x%lx ile sonu�land�\n"
+msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "önceden tanımlanmış işlemler kipinde (batchmode) parola sorgulanamaz\n"
 
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "Anahtar parolasını girin: "
+
+#: g10/passphrase.c:1131
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 "\n"
-"Gizli anahtar�n kilidini a�mak i�in bir anahtar parolas�na ihtiyac�n�z var.\n"
-"Anahtar�n sahibi: \""
+"Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
+"Anahtarın sahibi: \""
 
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "%u bitlik %s anahtar�, kimlik: %08lX, olu�turuldu %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr ""
+"%u bitlik %s anahtarı, %08lX kimliği ile\n"
+"%s tarihinde üretilmiş"
 
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "�nceden tan�mlanm�� i�lemler kipinde (batchmode) parola sorgulanamaz\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
 
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "Anahtar parolas�n� girin: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (asıl anahtar kimliği %08lX)"
 
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "veri kaydedilmedi; kaydetmek i�in \"--output\" se�ene�ini kullan�n\n"
+msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
 #, c-format
 msgid "error creating `%s': %s\n"
-msgstr "`%s' olu�turulurken hata: %s\n"
+msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
 msgid "Detached signature.\n"
-msgstr "Ba��ms�z imza.\n"
+msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
 msgid "Please enter name of data file: "
-msgstr "L�tfen veri dosyas�n�n ismini girin: "
+msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
 msgid "no signed data\n"
-msgstr "imzal� veri yok\n"
+msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "imzal� veri '%s'  a��lamad�\n"
+msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: 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:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonim alıcı: %08lX gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "tamam, biz anonim al�c�y�z.\n"
+msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
-msgstr "DEK'in eski kodlamas� desteklenmiyor\n"
+msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "�ifre algoritmas� %d%s bilinmiyor ya da iptal edilmi�\n"
+msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: 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:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "BİLGİ: %d şifre algoritması tercihlerde bulunamadı\n"
 
-#: 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:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s 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
+#: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "B�LG�: anahtar y�r�rl�kten kald�r�lm��t�"
-
-#: g10/hkp.c:71
-#, c-format
-msgid "requesting key %08lX from %s\n"
-msgstr "%08lX anahtar� %s adresinden isteniyor\n"
-
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "anahtar sunucusunun %s adresinden anahtar al�namad�\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "\"%s\" adresine g�nderme hatas�: %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "\"%s\" adresine g�nderme i�lemi ba�ar�l� (durum=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-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:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "bu anahtar sunucusu tamamen HKP uyumlu de�il\n"
-
-#: g10/hkp.c:515
-#, 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:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "anahtar sunucusu aranam�yor: %s\n"
+msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
-msgstr "gizli anahtar par�alar� kullan�m d���\n"
+msgstr "gizli anahtar parçaları kullanım dışı\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "koruma algoritmas� %d%s desteklenmiyor\n"
+msgstr "koruma algoritması %d%s desteklenmiyor\n"
+
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "koruma algoritması %d%s desteklenmiyor\n"
 
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
-msgstr "Anahtar parolas� ge�ersiz; l�tfen tekrar deneyin"
+msgstr "Anahtar parolası geçersiz; lütfen tekrar deneyin"
 
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
-"UYARI: Zay�f anahtar saptand� - l�tfen anahtar parolas�n� tekrar "
-"de�i�tirin.\n"
+"UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
+"değiştirin.\n"
 
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr ""
-"gizli anahtar�n g�venli�i i�in eski tarz 16 bitlik sa�lama toplam� "
-"�retiliyor\n"
+"gizli anahtarın güvenliği için eski tarz 16 bitlik sağlama toplamı "
+"üretiliyor\n"
 
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "UYARI: iletideki imza �z�mlemesi �eli�kili\n"
+msgstr "UYARI: iletideki imza özümlemesi çelişkili\n"
 
-#: g10/sig-check.c:215
-#, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
-msgstr "key %08lX: bu, imzalar i�in g�venli olmayan PGP �retimi bir ElGamal anahtar�!\n"
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "UYARI: %08lX imzalama alt anahtarı çapraz sertifikalı değil\n"
 
-#: g10/sig-check.c:224
-#, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "UYARI: %08lX imzalama alt anahtarının çapraz sertifikası geçersiz\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
 msgstr "genel anahtar %08lX imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:225
-#, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
 msgstr "genel anahtar %08lX imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:234
-#, c-format
+#: g10/sig-check.c:180
+#, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
-msgstr "anahtar %08lX %lu saniye sonra �retilmi� (zaman sapmas� veya saat problemi)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/sig-check.c:236
-#, c-format
+#: g10/sig-check.c:182
+#, fuzzy, c-format
 msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr ""
-"anahtar %08lX bundan %lu saniye sonra �retilmi� (zaman sapmas� veya saat "
+"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
-msgstr "B�LG�: %08lX imza anahtar�n�n kullan�m s�resi %s tarihinde dolmu�\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "BİLGİ: %08lX imza anahtarının kullanım süresi %s sularında dolmuş\n"
 
-#: g10/sig-check.c:348
-#, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr ""
+"hatalı imzanın bilinmeyen bir kritik bitten dolayı %08lX anahtarından "
+"kaynaklandığı sanılıyor\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr ""
-"Hatal� imzan�n bilinmeyen bir kritik bitten dolay� %08lX anahtar�ndan "
-"kaynakland��� san�l�yor\n"
+"anahtar %08lX: anahtarı yürürlükten kaldıracak yardımcı anahtar paketi yok\n"
 
-#: g10/sign.c:103
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "anahtar %08lX: yardımcı anahtarı bağlamak için yardımcı anahtar yok\n"
 
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "niteleme verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "niteleme verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
+
+#: g10/sign.c:112
+#, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
-"UYARI: %%-geni�letmesi imkans�z (�ok b�y�k).\n"
-"Uzat�lmadan kullan�l�yor.\n"
+"UYARI: %%-genişletmesi 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"
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (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:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (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"
+"UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
+"Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:303
+#: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "olu�turulan imzan�n denetimi ba�ar�s�z: %s\n"
+msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:312
-#, c-format
-msgid "%s signature from: \"%s\"\n"
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s imza: \"%s\"den\n"
 
-#: g10/sign.c:461
+#: g10/sign.c:550
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "UYARI: \"%s\" dosyas� bo�\n"
+msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/sign.c:644
+#: g10/sign.c:741
 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 ay�rma imzalamas� yapabilirsiniz\n"
+msgstr ""
+"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
 #, c-format
 msgid "can't create %s: %s\n"
-msgstr "%s olu�turulam�yor: %s\n"
+msgstr "%s oluşturulamıyor: %s\n"
 
-#: g10/sign.c:690
+#: g10/sign.c:794
 #, c-format
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "al�c�n�n tercihleriyle �eli�en %s (%d) �z�mleme algoritmas� kullan�m� zorlan�yor\n"
+msgstr ""
+"alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
+"isteniyor\n"
 
-#: g10/sign.c:784
+#: g10/sign.c:886
 msgid "signing:"
-msgstr "imzalan�yor:"
+msgstr "imzalanıyor:"
 
-#: g10/sign.c:876
+#: g10/sign.c:985
 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 temiz imzalama yapabilirsiniz\n"
+msgstr ""
+"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
+"yapabilirsiniz\n"
 
-#: g10/sign.c:1029
+#: g10/sign.c:1138
 #, c-format
 msgid "%s encryption will be used\n"
-msgstr "%s �ifrelemesi kullan�lmayacak\n"
+msgstr "%s şifrelemesi kullanılmayacak\n"
 
 #: g10/textfilter.c:134
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "%d karakterden daha uzun metin sat�rlar� okunam�yor\n"
+msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
 
 #: g10/textfilter.c:231
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr "girdi sat�r� %d karakterden daha uzun\n"
+msgstr "girdi satırı %d karakterden daha uzun\n"
 
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "g�vence veritaban� %lu kayd�: eri�im ba�ar�s�z: %s\n"
+msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "g�vence veritaban� %lu kayd�: yazma ba�ar�s�z (n=%d): %s\n"
+msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
 
 #: g10/tdbio.c:244
 msgid "trustdb transaction too large\n"
-msgstr "g�vence veritaban� i�lemi �ok uzun\n"
+msgstr "güvence veritabanı işlemi çok uzun\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
 #, c-format
 msgid "%s: can't access: %s\n"
-msgstr "%s: eri�ilemedi: %s\n"
+msgstr "%s: erişilemedi: %s\n"
 
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
 #, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s: kilit olu�turulamad�\n"
+msgstr "%s: kilit oluşturulamadı\n"
 
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
 #, c-format
 msgid "%s: can't make lock\n"
-msgstr "%s: kilitleme yap�lamad�\n"
+msgstr "%s: kilitleme yapılamadı\n"
 
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
 #, c-format
 msgid "%s: can't create: %s\n"
-msgstr "%s: olu�turulamad�: %s\n"
+msgstr "%s: oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: s�r�m kayd� olu�turmada ba�ar�s�z: %s"
+msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
 
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: ge�ersiz g�vence veritaban� olu�turuldu\n"
+msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: g�vence veritaban� olu�turuldu\n"
+msgstr "%s: güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
 msgid "NOTE: trustdb not writable\n"
-msgstr "B�LG�: g�vence veritaban�na yaz�lam�yor\n"
+msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: g�vence veritaban� ge�ersiz\n"
+msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: nitelemeli tablo olu�turulamad�: %s\n"
+msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: s�r�m kayd�n�n g�ncellenmesinde hata: %s\n"
+msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
 #, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: s�r�m kayd�n�n okunmas�nda hata: %s\n"
+msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: s�r�m kayd�n�n yaz�lmas�nda hata: %s\n"
+msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "g�vence veritaban�: eri�im ba�ar�s�z: %s\n"
+msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "g�vence veritaban�: okuma ba�ar�s�z (n=%d): %s\n"
+msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: bir g�vence veritaban� dosyas� de�il\n"
+msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s: %lu kay�t numaras� ile s�r�m kayd�\n"
+msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
 #, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "%s: dosya s�r�m� %d ge�ersiz\n"
+msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: serbest kayd� okuma hatas�: %s\n"
+msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: dizin kayd�n� yazma hatas�: %s\n"
+msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: kay�t s�f�rlama ba�ar�s�z: %s\n"
+msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s: kay�t ekleme ba�ar�s�z: %s\n"
+msgstr "%s: kayıt ekleme başarısız: %s\n"
 
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "g�vence veritaban� bozulmu�; l�tfen \"gpg --fix-trustdb\" �al��t�r�n.\n"
+msgstr ""
+"güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "`%s' ge�erli bir anahtar kimli�i de�il\n"
+msgstr "`%s' geçerli bir anahtar kimliği değil\n"
 
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
-msgstr "%08lX anahtar�: g�venli anahtar olarak kabul edildi\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "%08lX anahtarı: güvenli anahtar olarak kabul edildi\n"
 
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "%08lX anahtar� g�vence veritaban�nda birden fazla kay�tta bulundu\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "%08lX anahtarı güvence veritabanında birden fazla kayıtta bulundu\n"
 
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
-msgstr "%08lX anahtar�: g�venli anahtar i�in genel anahtar yok - atland�\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "%08lX anahtarı: güvenli anahtar için genel anahtar yok - atlandı\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "anahtar son derece güvenli olarak imlendi.\n"
+
+#: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "g�vence veritaban� kayd� %lu, istek tipi %d: okuma ba�ar�s�z: %s\n"
+msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
 
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "g�vence veritaban�n�n %lu. kayd� %d istek t�r�nde de�il\n"
+msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "g�vence veritaban�n�n %lu. kayd�, %d t�r�nde: yazma ba�ar�s�z: %s\n"
+msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
 
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "g�vence veritaban�: e�zamanlama ba�ar�s�z: %s\n"
+msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "asla    "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:544
 msgid "no need for a trustdb check\n"
-msgstr "bir g�vence veritaban� denetimi gereksiz\n"
+msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "sonraki g�vence veritaban� denetimi %s de\n"
+msgstr "sonraki güvence veritabanı denetimi %s de\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "bir güvence veritabanı denetimi gereksiz\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "bir güvence veritabanı denetimi gereksiz\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "%08lX genel anahtarı yok: %s\n"
 
-#: g10/trustdb.c:779
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "lütfen bir --check-trustdb yapın\n"
+
+#: g10/trustdb.c:991
 msgid "checking the trustdb\n"
-msgstr "g�vence veritaban� denetleniyor\n"
+msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:933
+#: g10/trustdb.c:1847
 #, c-format
-msgid "public key %08lX not found: %s\n"
-msgstr "%08lX genel anahtar� yok: %s\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "son derece güvenli bir anahtar yok\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "son derece güvenli %08lX genel anahtarı yok\n"
 
-#: g10/trustdb.c:1515
+#: g10/trustdb.c:1948
 #, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr "son derece g�venli %08lX genel anahtar� yok\n"
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
 
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:2034
 #, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
-"denetim %d derinlikte yap�l�yor: signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%"
-"d\n"
 
-#: g10/verify.c:108
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
+
+#: g10/verify.c:110
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"imza do�rulanamad�.\n"
-"�mza dosyas�n�n (.sig veya .asc) komut sat�r�nda verilecek\n"
-"ilk dosya olmas� gerekti�ini l�tfen hat�rlay�n.\n"
+"imza doğrulanamadı.\n"
+"İmza dosyasının (.sig veya .asc) komut satırında verilecek\n"
+"ilk dosya olması gerektiğini lütfen hatırlayın.\n"
 
-#: g10/verify.c:173
+#: g10/verify.c:177
 #, c-format
 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"
+msgstr "girdi satırı %u ya çok uzun ya da sonunda satırsonu karakteri yok\n"
 
 #: 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"
+msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
 #: g10/skclist.c:157
 #, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "`%s' atland�: tekrarlanm��\n"
+msgstr "`%s' atlandı: tekrarlanmış\n"
 
 #: g10/skclist.c:164 g10/skclist.c:172
 #, c-format
 msgid "skipped `%s': %s\n"
-msgstr "\"%s\" atland�: %s\n"
+msgstr "\"%s\" atlandı: %s\n"
 
 #: g10/skclist.c:168
 msgid "skipped: secret key already present\n"
-msgstr "atland�: gizli anahtar zaten var\n"
+msgstr "atlandı: gizli anahtar zaten var\n"
 
 #: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"`%s' atland�:\n"
-"Bu, imzalar i�in g�venli olmayan PGP �retimi bir ElGamal anahtar�!\n"
+"`%s' atlandı:\n"
+"Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!\n"
 
-#. do not overwrite
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "\"%s\" dosyas� var. "
+msgstr "\"%s\" dosyası var. "
 
 #: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
-msgstr "�zerine yaz�ls�n m�? (e/H)? "
+msgstr "Üzerine yazılsın mı? (e/H)? "
 
 #: g10/openfile.c:119
 #, c-format
@@ -4114,220 +4680,193 @@ msgstr "%s: bilinmeyen sonek\n"
 msgid "Enter new filename"
 msgstr "Yeni dosya ismini giriniz"
 
-#: g10/openfile.c:184
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
-msgstr "standart ��kt�ya yaz�yor\n"
+msgstr "standart çıktıya yazıyor\n"
 
-#: g10/openfile.c:273
+#: g10/openfile.c:282
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "\"%s\" i�indeki veri imzal� kabul ediliyor\n"
+msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
-#: g10/openfile.c:326
+#: g10/openfile.c:349
 #, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "yeni yap�land�rma dosyas� `%s' olu�turuldu\n"
+msgstr "yeni yapılandırma dosyası `%s' oluşturuldu\n"
 
-#: g10/openfile.c:353
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr ""
+"UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
+
+#: g10/openfile.c:380
 #, c-format
 msgid "%s: can't create directory: %s\n"
-msgstr "%s: dizin olu�turulam�yor: %s\n"
+msgstr "%s: dizin oluşturulamıyor: %s\n"
 
-#: g10/openfile.c:356
+#: g10/openfile.c:383
 #, c-format
 msgid "%s: directory created\n"
-msgstr "%s: dizin olu�turuldu\n"
+msgstr "%s: dizin oluşturuldu\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "UYARI: ileti simetrik �ifre i�indeki zay�f bir anahtarla �ifrelendi.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
-msgstr "�ifreli paketin elde edilmesinde sorun var\n"
+msgstr "şifreli paketin elde edilmesinde sorun var\n"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
-msgstr "zay�f anahtar olu�turuldu - yeniden deneniyor\n"
+msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
 
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"simetrik �ifre i�in zay�f anahtar�n �nlenmesi m�mk�n olamad�: %d kere "
+"simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
 "denendi!\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA, 160 bitlik bir hash algoritmas� kullan�lmas�n� gerektiriyor\n"
+msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n"
 
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(anahtar� parmak izi ile belirtmedik�e)\n"
+msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
 
-#: g10/delkey.c:126
+#: g10/delkey.c:127
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "�nceden belirlenmi� i�lemler kipinde \"--yes\" olmaks�z�n yap�lamaz\n"
+msgstr "önceden belirlenmiş işlemler kipinde \"--yes\" olmaksızın yapılamaz\n"
 
-#: g10/delkey.c:150
+#: g10/delkey.c:139
 msgid "Delete this key from the keyring? "
 msgstr "Bu anahtar, anahtar zincirinden silinsin mi? "
 
-#: g10/delkey.c:158
+#: g10/delkey.c:147
 msgid "This is a secret key! - really delete? "
-msgstr "Bu bir gizli anahtar! - ger�ekten silinecek mi? "
+msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? "
 
-#: g10/delkey.c:168
+#: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "anahtar blo�u silinemedi: %s\n"
+msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/delkey.c:178
+#: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
-msgstr "sahibinin g�vencesi bilgisi temizlendi\n"
+msgstr "sahibinin güvencesi bilgisi temizlendi\n"
 
-#: g10/delkey.c:206
+#: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "genel anahtar \"%s\" i�in bir gizli anahtar var!\n"
+msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 
-#: g10/delkey.c:208
+#: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "onu �nce \"--delete-secret-keys\" ile silmelisiniz.\n"
+msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/helptext.c:47
+#: g10/helptext.c:48
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"Bir de�eri buraya i�aretlemek size kalm��; bu de�er herhangi bir 3. �ahsa\n"
-"g�nderilmeyecek. Bir g�vence a�� sa�lamak i�in bizim buna ihtiyac�m�z var;\n"
-"bunun (a��k�a belirtilmeden olu�turulmu�) sertifikalar a��yla\n"
-"hi�bir alakas� yok."
+"Bir değeri buraya işaretlemek size kalmış; bu değer herhangi bir 3. şahsa\n"
+"gönderilmeyecek. Bir güvence ağı sağlamak için bizim buna ihtiyacımız var;\n"
+"bunun (açıkça belirtilmeden oluşturulmuş) sertifikalar ağıyla\n"
+"hiçbir alakası yok."
 
-#: g10/helptext.c:53
+#: g10/helptext.c:54
 msgid ""
 "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 "ultimately trusted - those are usually the keys for which you have\n"
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
-"Web-of-Trust olu�turulabilmesi i�in GnuPG'ye hangi anahtarlar�n son derece\n"
-"g�venli (bunlar gizli anahtarlar�na eri�iminiz olan anahtarlard�r) "
-"oldu�unun\n"
-"bildirilmesi gerekir. \"evet\" yan�t� bu anahtar�n son derece g�venli\n"
-"oldu�unun belirtilmesi i�in yeterlidir.\n"
+"Web-of-Trust oluşturulabilmesi için GnuPG'ye hangi anahtarların son derece\n"
+"güvenli (bunlar gizli anahtarlarına erişiminiz olan anahtarlardır) "
+"olduğunun\n"
+"bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
+"olduğunun belirtilmesi için yeterlidir.\n"
 
-#: g10/helptext.c:60
+#: g10/helptext.c:61
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
 msgstr ""
-"Bu y�r�rl�kten kald�r�lm�� anahtar� yine de kullanmak istiyorsan�z\n"
-"cevap olarak \"evet\" yaz�n."
+"Bu yürürlükten kaldırılmış anahtarı yine de kullanmak istiyorsanız\n"
+"cevap olarak \"evet\" yazın."
 
-#: g10/helptext.c:64
+#: g10/helptext.c:65
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr ""
-"Bu g�vencesiz anahtar� yine de kullanmak istiyorsan�z cevap olarak\n"
-" \"evet\" yaz�n."
+"Bu güvencesiz anahtarı yine de kullanmak istiyorsanız cevap olarak\n"
+" \"evet\" yazın."
 
-#: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "Bu iletiyi g�nderece�iniz adresin kullan�c� kimli�ini giriniz."
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Bu iletiyi göndereceğiniz adresin kullanıcı kimliğini giriniz."
 
-#: g10/helptext.c:72
+#: g10/helptext.c:73
 msgid ""
 "Select the algorithm to use.\n"
 "\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures.  This is the suggested algorithm because verification of\n"
-"DSA signatures are much faster than those of ElGamal.\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
 "\n"
-"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
-"only\n"
-"and a sign+encrypt; actually it is the same, but some parameters must be\n"
-"selected in a special way to create a safe key for signatures: this program\n"
-"does this but other OpenPGP implementations are not required to understand\n"
-"the signature+encryption flavor.\n"
+"Elgamal is an encrypt-only algorithm.\n"
 "\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"Kullan�lacak algoritmay� se�iniz.\n"
+"RSA may be used for signatures or encryption.\n"
 "\n"
-"DSA (DSS olarak da bilinir) sadece imzalar i�in kullan�lan bir say�sal\n"
-"imza algoritmas�d�r. Bu algoritma ElGamal algoritmas�ndan �ok daha h�zl�\n"
-"do�ruland��� i�in �nerilmektedir.\n"
-"\n"
-"ElGamal imzalar ve �ifreleme i�in kullan�lan bir algoritmad�r.\n"
-"OpenPGP bu algoritman�n bu iki kullan�m�n� birbirinden ay�r�r:\n"
-"sadece �ifreleme ve imza+�ifreleme; esas olarak ayn� gibi g�r�nmekle "
-"beraber\n"
-"imzalar i�in kullan�lacak anahtar� olu�turacak baz� �zel parametrelerin\n"
-"se�ilmesini gerektirir: bu program bunu yapar ama di�er OpenPGP\n"
-"ger�eklemelerinin imza+�ifreleme olay�n� anlamas� gerekmiyorsa kullanmak\n"
-"anlaml� olur.\n"
-"\n"
-"�lk (as�l) anahtar imzalama yetene�ine sahip bir anahtar olmal�d�r;\n"
-"bu durum, sadece �ifreleme yapabilen ElGamal anahtarlar�n�n neden men�de\n"
-"bulunmad���n� a��klar."
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
 msgstr ""
-"Bu anahtarlar t�m programlar taraf�ndan desteklenmedi�i i�in ve\n"
-"onlarla olu�turulan imzalar gere�inden b�y�k ve do�rulanmas� �ok yava�\n"
-"oldu�undan RFC2440 standard�nda tan�ml� olmalar�na ra�men tavsiye\n"
-"edilmezler."
 
-#: g10/helptext.c:98
+#: g10/helptext.c:87
 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 ""
-"Genelde imzalama ve �ifreleme i�in ayn� anahtar� kullanmak iyi bir fikir\n"
-"de�ildir. Bu algoritma sadece belli alanlarda kullan�labilir.\n"
-"L�tfen g�venlik uzman�n�za dan���n."
+"Genelde imzalama ve şifreleme için aynı anahtarı kullanmak iyi bir fikir\n"
+"değildir. Bu algoritma sadece belli alanlarda kullanılabilir.\n"
+"Lütfen güvenlik uzmanınıza danışın."
 
-#: g10/helptext.c:105
+#: g10/helptext.c:94
 msgid "Enter the size of the key"
-msgstr "Anahtar uzunlu�unu giriniz"
+msgstr "Anahtar uzunluğunu giriniz"
 
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
 msgid "Answer \"yes\" or \"no\""
-msgstr "Cevap \"evet\" ya da \"hay�r\""
+msgstr "Cevap \"evet\" ya da \"hayır\""
 
-#: g10/helptext.c:119
+#: g10/helptext.c:108
 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"
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"�stenen de�eri girin. ISO tarihi (YYYY-AA-GG) girmeniz m�mk�nd�r fakat\n"
-"iyi bir hata cevab� alamazs�n�z -- onun yerine sistem verilen de�eri\n"
-"bir zaman aral��� olarak ��z�mlemeyi dener."
+"İstenen değeri girin. ISO tarihi (YYYY-AA-GG) girmeniz mümkündür fakat\n"
+"iyi bir hata cevabı alamazsınız -- onun yerine sistem verilen değeri\n"
+"bir zaman aralığı olarak çözümlemeyi dener."
 
-#: g10/helptext.c:131
+#: g10/helptext.c:120
 msgid "Enter the name of the key holder"
 msgstr "Anahtar tutucunun ismini giriniz"
 
-#: g10/helptext.c:136
+#: g10/helptext.c:125
 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)"
+msgstr ""
+"lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
 
-#: g10/helptext.c:140
+#: g10/helptext.c:129
 msgid "Please enter an optional comment"
-msgstr "L�tfen �nbilgi girin (iste�e ba�l�)"
+msgstr "Lütfen önbilgi girin (isteğe bağlı)"
 
-#: g10/helptext.c:145
+#: g10/helptext.c:134
 msgid ""
 "N  to change the name.\n"
 "C  to change the comment.\n"
@@ -4335,17 +4874,17 @@ msgid ""
 "O  to continue with key generation.\n"
 "Q  to to quit the key generation."
 msgstr ""
-"S iSim de�i�tirmek i�in.\n"
-"B �nBilgiyi de�i�tirmek i�in.\n"
-"P e-Posta adresini de�i�tirmek i�in.\n"
-"D anahtar �retimine Devam etmek i�in.\n"
-"K anahtar �retiminden ��Kmak i�in."
+"S iSim değiştirmek için.\n"
+"B önBilgiyi değiştirmek için.\n"
+"P e-Posta adresini değiştirmek için.\n"
+"D anahtar üretimine Devam etmek için.\n"
+"K anahtar üretiminden çıKmak için."
 
-#: g10/helptext.c:154
+#: g10/helptext.c:143
 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."
+msgstr "Yardımcı anahtarı üretmek istiyorsanız \"evet\" ya da \"e\" girin."
 
-#: g10/helptext.c:162
+#: g10/helptext.c:151
 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"
@@ -4385,73 +4924,73 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"Bir anahtar� bir kullan�c� kimlikle imzalamadan �nce kullan�c� kimli�in\n"
-"i�indeki ismin, anahtar�n sahibine ait olup olmad���n� kontrol etmelisiniz.\n"
+"Bir anahtarı bir kullanıcı kimlikle imzalamadan önce kullanıcı kimliğin\n"
+"içindeki ismin, anahtarın sahibine ait olup olmadığını kontrol etmelisiniz.\n"
 "\n"
-"\"0\" bu kontrolu yapmad���n�z ve yapmay� da bilmedi�iniz anlam�ndad�r.\n"
-"\"1\" anahtar size sahibi taraf�ndan g�nderildi ama siz bu anahtar� ba�ka\n"
-"      kaynaklardan do�rulamad�n�z anlam�ndad�r. Bu ki�isel do�rulama i�in\n"
-"      yeterlidir. En az�nda yar� anonim bir anahtar imzalamas� yapm��\n"
+"\"0\" bu kontrolu yapmadığınız ve yapmayı da bilmediğiniz anlamındadır.\n"
+"\"1\" anahtar size sahibi tarafından gönderildi ama siz bu anahtarı başka\n"
+"      kaynaklardan doğrulamadınız anlamındadır. Bu kişisel doğrulama için\n"
+"      yeterlidir. En azında yarı anonim bir anahtar imzalaması yapmış\n"
 "      olursunuz.\n"
-"\"2\" ayr�nt�l� bir inceleme yap�ld��� anlam�ndad�r. �rne�in parmakizi ve\n"
-"      bir anahtar�n foto kimli�iyle kullan�c� kimli�ini kar��la�t�rmak\n"
-"      gibi denetimleri yapm��s�n�zd�r.\n"
-"\"3\" inceden inceye bir do�rulama anlat�r. �rne�in, �ah�staki anahtar�n\n"
-"      sahibi ile anahtar parmak izini kar��la�t�rm��s�n�zd�r ve anahtardaki\n"
-"      kullan�c� kimlikte belirtilen isme ait bir bas�l� kimlik belgesindeki\n"
-"      bir foto�rafla �ahs� kar��la�t�rm��s�n�zd�r ve son olarak anahtar\n"
-"      sahibinin e-posta adresini kendisinin kullanmakta oldu�unu da\n"
-"      denetlemi�sinizdir.\n"
-"Burada 2 ve 3 i�in verilen �rnekler *sadece* �rnektir.\n"
-"Eninde sonunda bir anahtar� imzalarken \"ayr�nt�l�\" ve \"inceden inceye\" "
-"kontroller aras�ndaki ayr�ma siz karar vereceksiniz.\n"
-"Bu karar� verebilecek durumda de�ilseniz \"0\" cevab�n� verin."
-
-#: g10/helptext.c:200
+"\"2\" ayrıntılı bir inceleme yapıldığı anlamındadır. Örneğin parmakizi ve\n"
+"      bir anahtarın foto kimliğiyle kullanıcı kimliğini karşılaştırmak\n"
+"      gibi denetimleri yapmışsınızdır.\n"
+"\"3\" inceden inceye bir doğrulama anlatır. Örneğin, şahıstaki anahtarın\n"
+"      sahibi ile anahtar parmak izini karşılaştırmışsınızdır ve anahtardaki\n"
+"      kullanıcı kimlikte belirtilen isme ait bir basılı kimlik belgesindeki\n"
+"      bir fotoğrafla şahsı karşılaştırmışsınızdır ve son olarak anahtar\n"
+"      sahibinin e-posta adresini kendisinin kullanmakta olduğunu da\n"
+"      denetlemişsinizdir.\n"
+"Burada 2 ve 3 için verilen örnekler *sadece* örnektir.\n"
+"Eninde sonunda bir anahtarı imzalarken \"ayrıntılı\" ve \"inceden inceye\" "
+"kontroller arasındaki ayrıma siz karar vereceksiniz.\n"
+"Bu kararı verebilecek durumda değilseniz \"0\" cevabını verin."
+
+#: g10/helptext.c:189
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
-msgstr "Kullan�c� kimliklerinin T�M�n� imzalamak istiyorsan�z \"evet\" girin"
+msgstr "Kullanıcı kimliklerinin TÜMünü imzalamak istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:193
 msgid ""
 "Answer \"yes\" if you really want to delete this user ID.\n"
 "All certificates are then also lost!"
 msgstr ""
-"Bu kullan�c� kimli�ini ger�ekten silmek istiyorsan�z \"evet\" girin.\n"
-"B�ylece b�t�n sertifikalar� kaybedeceksiniz!"
+"Bu kullanıcı kimliğini gerçekten silmek istiyorsanız \"evet\" girin.\n"
+"Böylece bütün sertifikaları kaybedeceksiniz!"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:198
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "Bu yard�mc� anahtar� silme izni vermek istiyorsan�z \"evet\" girin"
+msgstr "Bu yardımcı anahtarı silme izni vermek istiyorsanız \"evet\" girin"
 
-#: g10/helptext.c:214
+#: g10/helptext.c:203
 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 ""
-"Bu, anahtar �zerinde ge�erli bir imzad�r; anahtara ya da bu anahtarla\n"
-"sertifikalanm�� bir di�er anahtara bir g�vence ba�lant�s� sa�lamakta\n"
-"�nemli olabilece�inden normalde bu imzay� silmek istemezsiniz."
+"Bu, anahtar üzerinde geçerli bir imzadır; anahtara ya da bu anahtarla\n"
+"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:219
+#: g10/helptext.c:208
 msgid ""
 "This signature can't be checked because you don't have the\n"
 "corresponding key.  You should postpone its deletion until you\n"
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"Bu imza, anahtar�na sahip olmad���n�zdan, kontrol edilemez. Bu imzan�n\n"
-"silinmesini hangi anahtar�n kullan�ld���n� bilene kadar\n"
-"ertelemelisiniz ��nk� bu imzalama anahtar� ba�ka bir sertifikal�\n"
-"anahtar vas�tas� ile bir g�vence ba�lant�s� sa�layabilir."
+"Bu imza, anahtarına sahip olmadığınızdan, kontrol edilemez. Bu imzanın\n"
+"silinmesini hangi anahtarın kullanıldığını bilene kadar\n"
+"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:225
+#: g10/helptext.c:214
 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."
+msgstr "İmza geçersiz. Onu anahtar zincirinizden kaldırmak uygun olacak."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:218
 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"
@@ -4459,46 +4998,46 @@ msgid ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"Bu imza kullan�c� kimli�ini anahtara ba�lar. �z-imzay� silmek hi� iyi\n"
-"bir fikir de�il. GnuPG bu anahtar� bir daha hi� kullanamayabilir.\n"
-"Bunu sadece, e�er bu �z-imza baz� durumlarda ge�erli de�ilse ya da\n"
-"kullan�labilir bir ikincisi var ise yap�n."
+"Bu imza kullanıcı kimliğini anahtara bağlar. Öz-imzayı silmek hiç iyi\n"
+"bir fikir değil. GnuPG bu anahtarı bir daha hiç kullanamayabilir.\n"
+"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:237
+#: g10/helptext.c:226
 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 ""
-"T�m kullan�c� kimlik tercihlerini (ya da se�ilen birini) mevcut tercihler\n"
-"listesine �evirir. T�m etkilenen �z-imzalar�n zaman damgalar� bir sonraki\n"
-"taraf�ndan �ne al�nacakt�r.\n"
+"Tüm kullanıcı kimlik tercihlerini (ya da seçilen birini) mevcut tercihler\n"
+"listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
+"tarafından öne alınacaktır.\n"
 
-#: g10/helptext.c:244
+#: g10/helptext.c:233
 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"
+msgstr "Lütfen bir anahtar parolası giriniz; yazdıklarınız görünmeyecek\n"
 
-#: g10/helptext.c:250
+#: g10/helptext.c:239
 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."
+msgstr "Lütfen son parolayı tekrarlayarak ne yazdığınızdan emin olun."
 
-#: g10/helptext.c:254
+#: g10/helptext.c:243
 msgid "Give the name of the file to which the signature applies"
-msgstr "�mzan�n uygulanaca�� dosyan�n ismini verin"
+msgstr "İmzanın uygulanacağı dosyanın ismini verin"
 
-#: g10/helptext.c:259
+#: g10/helptext.c:248
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "Dosyan�n �zerine yaz�lacaksa l�tfen \"evet\" yaz�n"
+msgstr "Dosyanın üzerine yazılacaksa lütfen \"evet\" yazın"
 
-#: g10/helptext.c:264
+#: g10/helptext.c:253
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 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."
+"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:270
+#: g10/helptext.c:259
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -4513,123 +5052,703 @@ msgid ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
-"Sertifikalama i�in bir sebep belirtmelisiniz. ��eri�ine ba�l� olarak\n"
-"bu listeden se�ebilirsiniz:\n"
+"Sertifikalama için bir sebep belirtmelisiniz. İçeriğine bağlı olarak\n"
+"bu listeden seçebilirsiniz:\n"
 "  \"Anahtar tehlikede\"\n"
-"\tYetkisiz ki�ilerin gizli anahtar�n�za eri�ebildi�ine inan�yorsan�z\n"
-"\tbunu se�in.\n"
-"  \"Anahtar ge�ici\"\n"
-"\tMevcut anahtar� daha yeni bir anahtar ile de�i�tirmi�seniz bunu se�in.\n"
-"  \"Anahtar art�k kullan�lmayacak\"\n"
-"\tAnahtar� emekliye ay�racaksan�z bunu se�in.\n"
-"  \"Kullan�c� kimli�i art�k ge�ersiz\"\n"
-"\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:286
+"\tYetkisiz kişilerin gizli anahtarınıza erişebildiğine inanıyorsanız\n"
+"\tbunu seçin.\n"
+"  \"Anahtar geçici\"\n"
+"\tMevcut anahtarı daha yeni bir anahtar ile değiştirmişseniz bunu seçin.\n"
+"  \"Anahtar artık kullanılmayacak\"\n"
+"\tAnahtarı emekliye ayıracaksanız bunu seçin.\n"
+"  \"Kullanıcı kimliği artık geçersiz\"\n"
+"\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:275
 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 ""
-"�sterseniz, neden bu y�r�rl�kten kald�rma sertifikas�n�\n"
-"verdi�inizi a��klayan bir metin girebilirsiniz.\n"
-"L�tfen bu metin k�sa olsun. Bir bo� sat�r metni bitirir.\n"
+"İsterseniz, neden bu yürürlükten kaldırma sertifikasını\n"
+"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:301
+#: g10/helptext.c:290
 msgid "No help available"
-msgstr "yard�m mevcut de�il"
+msgstr "yardım mevcut değil"
 
-#: g10/helptext.c:309
+#: g10/helptext.c:298
 #, c-format
 msgid "No help available for `%s'"
-msgstr "\"%s\" i�in yard�m mevcut de�il"
+msgstr "\"%s\" için yardım mevcut değil"
 
-#: g10/keydb.c:178
+#: g10/keydb.c:189
 #, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "`%s' anahtar zinciri olu�turulurken hata: %s\n"
+msgstr "`%s' anahtar zinciri oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:185
+#: g10/keydb.c:196
 #, c-format
 msgid "keyring `%s' created\n"
-msgstr "`%s' anahtar zinciri olu�turuldu\n"
+msgstr "`%s' anahtar zinciri oluşturuldu\n"
 
-#: g10/keydb.c:575
+#: g10/keydb.c:615
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "anahtar zinciri belle�i yeniden olu�turulurken hata: %s\n"
+msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "UYARI: gizli bilgi i�eren 2 dosya mevcut.\n"
+msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
 
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the unchanged one\n"
-msgstr "%s de�i�meyenlerden\n"
+msgstr "%s değişmeyenlerden\n"
 
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s yenilerden\n"
 
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
 msgid "Please fix this possible security flaw\n"
-msgstr "L�tfen bu g�venlik �atla��n� giderin\n"
+msgstr "Lütfen bu güvenlik çatlağını giderin\n"
 
-#: g10/keyring.c:1346
-#, c-format
-msgid "checking keyring `%s'\n"
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
 msgstr "`%s' anahtar zinciri denetleniyor\n"
 
-#: g10/keyring.c:1377
-#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "�imdiye dek %lu anahtar denetlendi (%lu imza)\n"
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu anahtar denetlendi (%lu imza)\n"
 
-#: g10/keyring.c:1388
-#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu anahtar denetlendi (%lu imza)\n"
 
-#: g10/keyring.c:1453
+#: g10/keyring.c:1484
 #, c-format
 msgid "%s: keyring created\n"
-msgstr "%s: anahtar zinciri olu�turuldu\n"
+msgstr "%s: anahtar zinciri oluşturuldu\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Foto kimliği olarak kullanılmak üzere bir resim seçiniz. Resim bir JPEG\n"
+"dosyası olmalıdır. Bu resim genel anahtarınızda saklanacağından, çok büyük\n"
+"bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
+"boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "\"%s\" resmi açılamıyor: %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" bir JPEG dosyası değil\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Bu foto doğru mu? (e/H/ç)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "foto kimliği gösterilemiyor!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "`%s' dizini oluşturulamıyor: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"güvensiz options dosyası yetkilerinden dolayı dış program çağrıları iptal\n"
+"edildi\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr " %s \"%s\" çalıştırılamıyor: %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "dış uygulama çalıştırılırken sistem hatası: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "Dış uygulamamnın doğal olmayan çıkışı\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "dış uygulama çalıştırılamıyor\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "dış uygulamanın yanıtı okunamıyor: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "asla    "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet başarısız: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "Yürürlükten kaldıran:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII zırhlı çıktı istendi.\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet başarısız: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "`%s' için yürürlükten kaldırma anahtarı yok\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "gizli anahtar `%s' yok: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "karşılığı olan genel anahtar yok: `%s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "bilinmeyen sıkıştırma algoritması\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "BİLGİ: Bu anahtar korunmamış!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Yürürlükten kaldırma sertifikası üretildi.\n"
+"\n"
+"Sertifika başkalarının kolayca erişebileceği yerlerde saklanmamalıdır.\n"
+"Aksi takdirde, yürürlükten kaldırma sertifikanız bilginiz dışında\n"
+"yayınlandığında geçerli olan genel anahtarınızın geçersiz hale gelebilir.\n"
+"Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
+"bir kasada da muhafaza edebilirsiniz.\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "İptal"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr ""
+"İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Yürürlükten kaldırma sebebi: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(açıklama verilmedi)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "Bu tamam mı? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Atanan güvencedeğerlerinin listesi %s oluşturuldu\n"
+"# (Eski haline getirmek için \"gpg --import-ownertrust\" kullanın\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "dosya açılamadı: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "satır çok uzun\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "hata: \":\" eksik\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "hata: parmakizi geçersiz\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "hata: hiç sahibiningüvencesi değeri yok\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "güvence kaydını ararken hata: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "okuma hatası: %s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr ""
+#~ "Uyarı: özümleme algoritması `%s' OpenPGP'nin parçası değildir. "
+#~ "Kullanırsanız, riski size ait!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[dosyalar]|dosyalar şifrelenir"
+
+#~ msgid "store only"
+#~ msgstr "sadece saklar"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[dosyalar]|dosyaların şifresi açılır"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "bir anahtarı iptal edilemez olarak imzalar"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "bir anahtarı yerel ve iptal edilemez olarak imzalar"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "sadece paketlerin silsilesini listeler"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "sahibiningüvencesi değerlerini gönderir"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "sahibiningüvencesi değerlerini indirir"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "bakımsız güvence veritabanının güncellemesi"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "bozulan güvence veritabanını onarır"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Bir dosya veya standart girdinin zırhını kaldırır"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Bir dosya veya standart girdiyi zırhlar"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "terminali hiç kullanma"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "v3 imzalarına zorlar"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "v3 imzalara zorlamaz"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "v4 imzalara zorlar"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "v4 imzalara zorlamaz"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "şifreleme için daima bir MDC kullanılır"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "şifreleme için asla bir MDC kullanılmaz"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "gpg-agent kullan"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "soruların çoğunda cevap evet farzedilir"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "soruların çoğunda cevap hayır farzedilir"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "bu gizli anahtar zincirini listeye ekler"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
+
+#~ msgid "read options from file"
+#~ msgstr "seçenekleri dosyadan okur"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|ANHKİML|bu anahtar son derece güvenli"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "RFC1991 de açıklanan kipi uygular"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|anahtar parolası kipi olarak N kullanılır"
+
+#~ 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"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|İSİM|anahtar parolaları için şifre algoritması olarak İSİM kullanılır"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "şifreli paketlerin anahtar-kimlik alanlarını atar"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "Foto kimliklerini gösterir"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "Foto kimliklerini göstermez"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "Komut satırını foto kimliklerini göstermeye ayarlar"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "bu dağıtımda sıkıştırma algoritması %s salt-okunurdur\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "sıkıştırma algoritması %d..%d aralığında olmalı\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: Bu anahtarın gerçekten sahibine ait olup olmadığından emin\n"
+#~ "olunamadı fakat yine de kabul edildi.\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "%c%lu tercihi geçersiz\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "%08lX anahtarı: bir RFC2440 anahtarı değil - atlandı\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr ""
+#~ "BİLGİ: Elgamal birincil anahtarı saptandı - alınması biraz zaman alacak\n"
+
+#~ msgid " (default)"
+#~ msgstr " (öntanımlı)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  üretildi: %s zamanaşımı: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "Niteleme: "
+
+#~ msgid "Policy: "
+#~ msgstr "Güvence: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "%08lX anahtarı %s adresinden isteniyor\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "anahtar sunucusunun %s adresinden anahtar alınamadı\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "\"%s\" adresine gönderme hatası: %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ 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"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "bu anahtar sunucusu --search-keys seçeneğini desteklemiyor\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "anahtar sunucusu aranamıyor: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "anahtar %08lX: Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal "
+#~ "anahtarı!\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "%08lX anahtarı %lu saniye gelecekte üretilmiş (zaman sapması veya saat "
+#~ "problemi)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "%08lX anahtarı %lu saniye gelecekte üretilmiş (zaman sapması veya saat "
+#~ "problemi)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "anahtar %08lX son derece güvenli olarak imlendi.\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "%08lX Elgamal imzalama anahtarından  %08lX'e  imza atlandı\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "%08lX den  %08lX Elgamal imzalama anahtarına imza atlandı\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr ""
+#~ "denetim %d derinlikte yapılıyor: signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/"
+#~ "%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "Kullanılacak algoritmayı seçiniz.\n"
+#~ "\n"
+#~ "DSA (DSS olarak da bilinir) sadece imzalar için kullanılan bir sayısal\n"
+#~ "imza algoritmasıdır. Bu algoritma ElGamal algoritmasından çok daha hızlı\n"
+#~ "doğrulandığı için önerilmektedir.\n"
+#~ "\n"
+#~ "ElGamal imzalar ve şifreleme için kullanılan bir algoritmadır.\n"
+#~ "OpenPGP bu algoritmanın bu iki kullanımını birbirinden ayırır:\n"
+#~ "sadece şifreleme ve imza+şifreleme; esas olarak aynı gibi görünmekle "
+#~ "beraber\n"
+#~ "imzalar için kullanılacak anahtarı oluşturacak bazı özel parametrelerin\n"
+#~ "seçilmesini gerektirir: bu program bunu yapar ama diğer OpenPGP\n"
+#~ "gerçeklemelerinin imza+şifreleme olayını anlaması gerekmiyorsa kullanmak\n"
+#~ "anlamlı olur.\n"
+#~ "\n"
+#~ "İlk (asıl) anahtar imzalama yeteneğine sahip bir anahtar olmalıdır;\n"
+#~ "bu durum, sadece şifreleme yapabilen ElGamal anahtarlarının neden menüde\n"
+#~ "bulunmadığını açıklar."
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "Bu anahtarlar tüm programlar tarafından desteklenmediği için ve\n"
+#~ "onlarla oluşturulan imzalar gereğinden büyük ve doğrulanması çok yavaş\n"
+#~ "olduğundan RFC2440 standardında tanımlı olmalarına rağmen tavsiye\n"
+#~ "edilmezler."
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "şimdiye dek %lu anahtar denetlendi (%lu imza)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "anahtarın içi boş\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "anahtar %08lX: içi boş\n"
 
 #, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "quit"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (imzalamak ve şifrelemek için)\n"
+
 #~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
 #~ msgstr ""
-#~ "Yeni se�enekler dosyas�n�n okunabilmesi i�in GnuPG yeniden "
-#~ "ba�lat�lmal�d�r\n"
+#~ "Bu algoritmanın kullanımı sadece GnuPG tarafından desteklenmektedir.\n"
+#~ "Bu anahtarı PGP kullanıcıları ile haberleşmek için kullanamayacaksınız\n"
+#~ "Bu algoritma ayrıca çok yavaş ve diğer seçimler kadar güvenli "
+#~ "olmayabilir.\n"
 
-#~ msgid "changing permission of  `%s' failed: %s\n"
-#~ msgstr "`%s' izinleri de�i�tirilemedi: %s\n"
+#~ msgid "Create anyway? "
+#~ msgstr "Yine de oluşturulsun mu? "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "geçersiz symkey algoritması saptandı (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "bu anahtar sunucusu tamamen HKP uyumlu değil\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr "Bu algoritmanın kullanımı uygun değil - Yine de oluşturulsun mu?"
 
 #~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|�S�M=DE�ER|veri bu nitelemeyle kullan�l�r"
+#~ 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"
+#~ 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"
+#~ "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 "
+#~ "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"
+#~ msgstr "Bir anahtarın sadece bir foto kimliği olabilir.\n"
 
 #~ msgid "Fingerprint:"
 #~ msgstr " Parmak izi:"
@@ -4637,22 +5756,28 @@ msgstr "%s: anahtar zinciri olu�turuldu\n"
 #~ msgid "             Fingerprint:"
 #~ msgstr "              Parmak izi:"
 
+#~ msgid "you have to start GnuPG again, so it can read the new options file\n"
+#~ msgstr ""
+#~ "Yeni seçenekler dosyasının okunabilmesi için GnuPG yeniden "
+#~ "başlatılmalıdır\n"
+
+#~ msgid "changing permission of  `%s' failed: %s\n"
+#~ msgstr "`%s' izinleri değiştirilemedi: %s\n"
+
 #~ msgid "Are you sure you still want to sign it?\n"
 #~ msgstr "Onu yine de imzalamak istiyor musunuz?\n"
 
 #~ msgid "  Are you sure you still want to sign it?\n"
 #~ msgstr "  Onu yine de imzalamak istiyor musunuz?\n"
 
-#, fuzzy
 #~ msgid "Really sign? (y/N) "
-#~ msgstr "Ger�ekten imzalayacak m�s�n�z? "
+#~ msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
 #~ msgid "key %08lX: our copy has no self-signature\n"
-#~ msgstr "anahtar %08lX: bizim kopyan�n �z-imzas� yok\n"
+#~ msgstr "anahtar %08lX: bizim kopyanın öz-imzası yok\n"
 
 #~ msgid "Do you really need such a large keysize? "
-#~ msgstr "Bu kadar b�y�k anahtar uzunlu�una ger�ekten ihtiyac�n�z var m�?"
+#~ msgstr "Bu kadar büyük anahtar uzunluğuna gerçekten ihtiyacınız var mı?"
 
 #~ msgid "   signed by %08lX at %s\n"
-#~ msgstr "   %08lX taraf�ndan %s de imzalanm��\n"
-
+#~ msgstr "   %08lX tarafından %s de imzalanmış\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 000000000..6e87ecd58
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,5595 @@
+# Simplified Chinese(zh-CN) messages for GnuPG
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Meng Jie <[email protected]>, 2004.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2004-07-20 15:50+0200\n"
+"Last-Translator: Meng Jie <[email protected]>\n"
+"Language-Team: Chinese (simplified) <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: util/secmem.c:90
+msgid "WARNING: using insecure memory!\n"
+msgstr "���棺����ʹ�ò���ȫ���ڴ棡\n"
+
+#: util/secmem.c:91
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr "����� http://www.gnupg.org/faq.html �Ի�ø���ϸ����Ϣ\n"
+
+#: util/secmem.c:340
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "��ȫ�ڴ�δ��ʼ�������ܽ��в���\n"
+
+#: util/secmem.c:341
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(������ʹ���˴���ij�������ɴ�������)\n"
+
+#: util/miscutil.c:307 util/miscutil.c:344
+msgid "yes"
+msgstr "yes"
+
+#: util/miscutil.c:308 util/miscutil.c:349
+msgid "yY"
+msgstr "yY"
+
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "no"
+
+#: util/miscutil.c:311 util/miscutil.c:350
+msgid "nN"
+msgstr "nN"
+
+#: util/miscutil.c:348 g10/keyedit.c:1138
+msgid "quit"
+msgstr "quit"
+
+#: util/miscutil.c:351
+msgid "qQ"
+msgstr "qQ"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "�������"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "δ֪�İ�����"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "δ֪�İ汾"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "δ֪�Ĺ�Կ�㷨"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "δ֪��ɢ���㷨"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "��Կ�Ѿ���"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "˽Կ�Ѿ���"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "ǩ���Ѿ���"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "У��ʹ���"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "���������"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "�Ҳ�����Կ"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "δ֪�ĶԳƼ����㷨"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "�޷���Կ�׻�"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "����"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "��Ч�� ASCII ��װ��ʽ"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "û������û���ʶ"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "˽Կ������"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "ʹ���˴����˽Կ"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "δ��֧��"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "��Կ����"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "�ļ���ȡ����"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "�ļ�д�����"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "δ֪��ѹ���㷨"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "�ļ��򿪴���"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "�ļ���������"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "��������"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "��δʵ�ֵĹ�Կ�㷨"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "��δʵ�ֵĶԳƼ����㷨"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "δ֪��ǩ�ֵȼ�"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "���ζ����ݿ����"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "�𻵵Ķྫ������(MPI)"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "��Դ����"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "��Ч��Կ�׻�"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "֤������"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "����������û���ʶ"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "�ļ��رմ���"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "�ļ�����������"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "�ļ�ɾ������"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "δԤ�ڵ�����"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "ʱ�����ì��"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "�޷�ʹ�õĹ�Կ�㷨"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "�ļ��Ѵ���"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "����Կ"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "���IJ���"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "URI ����"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "δ��֧�ֵ� URI"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "�������"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "�����"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "�����"
+
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "�����õĹ�Կ"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "�����õ�˽Կ"
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr "��Կ����������"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "�������Ǹ�����ȱ��(%s:%d:%s)\n"
+
+#: util/logger.c:285
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "���ҵ�һ������ȱ���ˡ���(%s:%d)\n"
+
+#: cipher/random.c:163
+msgid "no entropy gathering module detected\n"
+msgstr "��ⲻ�������Ѽ�ģ��\n"
+
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "�޷��򿪡�%s���� %s\n"
+
+#: cipher/random.c:391
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "�޷�����ļ���%s������Ϣ�� %s\n"
+
+#: cipher/random.c:396
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "��%s������һ���Ϻ���׼���ļ������Ѻ���\n"
+
+#: cipher/random.c:401
+msgid "note: random_seed file is empty\n"
+msgstr "ע�⣺����������ļ�Ϊ��\n"
+
+#: cipher/random.c:407
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "���棺����������ļ���С��Ч����δʹ��\n"
+
+#: cipher/random.c:415
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "�޷���ȡ��%s����%s\n"
+
+#: cipher/random.c:453
+msgid "note: random_seed file not updated\n"
+msgstr "ע�⣺����������ļ�δ������\n"
+
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "�޷�������%s����%s\n"
+
+#: cipher/random.c:480
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "�޷�д�롮%s����%s\n"
+
+#: cipher/random.c:483
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "�޷��رա�%s����%s\n"
+
+#: cipher/random.c:728
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "���棺����ʹ�ò���ȫ�����������������\n"
+
+#: cipher/random.c:729
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"���������ַ������������Ǵ��ӻ⩤��\n"
+"�������Ͳ���ǿ�������������������\n"
+"\n"
+"*���Բ�Ҫʹ���������������κ����ݣ���\n"
+"\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"����ֽڲ����ࡣ������һЩ���������£�\n"
+"��ʹ�ò���ϵͳ���Ѽ��������������(����Ҫ%d�ֽ�)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "��%s��ɢ���㷨�ڱ����а汾��ֻ��\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"���Դ�Ƭ�̣�ϵͳ��ʱ�����Ѽ��������������������ĵĻ���\n"
+"������Щ����£�ʵ�����������ܹ���������Ʒ�ʸ��á�\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "�޷����ɶ��� %d λ������\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "�޷����ɶ��� %d λ������\n"
+
+#: g10/g10.c:354
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@ָ�\n"
+" "
+
+#: g10/g10.c:356
+msgid "|[file]|make a signature"
+msgstr "|[�ļ���]|����һ��ǩ��"
+
+#: g10/g10.c:357
+msgid "|[file]|make a clear text signature"
+msgstr "|[�ļ���]|����һ������ǩ��"
+
+#: g10/g10.c:358
+msgid "make a detached signature"
+msgstr "����һ�ݷ����ǩ��"
+
+#: g10/g10.c:359
+msgid "encrypt data"
+msgstr "��������"
+
+#: g10/g10.c:361
+msgid "encryption only with symmetric cipher"
+msgstr "��ʹ�öԳƼ���"
+
+#: g10/g10.c:363
+msgid "decrypt data (default)"
+msgstr "��������(Ĭ��)"
+
+#: g10/g10.c:365
+msgid "verify a signature"
+msgstr "��֤ǩ��"
+
+#: g10/g10.c:367
+msgid "list keys"
+msgstr "�г���Կ"
+
+#: g10/g10.c:369
+msgid "list keys and signatures"
+msgstr "�г���Կ��ǩ��"
+
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "�����Կǩ��"
+
+#: g10/g10.c:371
+msgid "list keys and fingerprints"
+msgstr "�г���Կ��ָ��"
+
+#: g10/g10.c:372
+msgid "list secret keys"
+msgstr "�г�˽Կ"
+
+#: g10/g10.c:373
+msgid "generate a new key pair"
+msgstr "����һ���µ���Կ��"
+
+#: g10/g10.c:374
+msgid "remove keys from the public keyring"
+msgstr "�ӹ�ԿԿ�׻���ɾ����Կ"
+
+#: g10/g10.c:376
+msgid "remove keys from the secret keyring"
+msgstr "��˽ԿԿ�׻���ɾ����Կ"
+
+#: g10/g10.c:377
+msgid "sign a key"
+msgstr "Ϊij����Կ����ǩ��"
+
+#: g10/g10.c:378
+msgid "sign a key locally"
+msgstr "Ϊij����Կ���ӱ���ǩ��"
+
+#: g10/g10.c:381
+msgid "sign or edit a key"
+msgstr "�༭ij����Կ��Ϊ������ǩ��"
+
+#: g10/g10.c:382
+msgid "generate a revocation certificate"
+msgstr "����һ�ݵ���֤��"
+
+#: g10/g10.c:384
+msgid "export keys"
+msgstr "������Կ"
+
+#: g10/g10.c:385
+msgid "export keys to a key server"
+msgstr "����Կ������ij����Կ��������"
+
+#: g10/g10.c:386
+msgid "import keys from a key server"
+msgstr "�ӹ�Կ�������ϵ�����Կ"
+
+#: g10/g10.c:388
+msgid "search for keys on a key server"
+msgstr "�ڹ�Կ����������Ѱ��Կ"
+
+#: g10/g10.c:390
+msgid "update all keys from a keyserver"
+msgstr "�ӹ�Կ�������������еı�����Կ"
+
+#: g10/g10.c:393
+msgid "import/merge keys"
+msgstr "����/�ϲ���Կ"
+
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
+
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
+
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
+
+#: g10/g10.c:406
+msgid "update the trust database"
+msgstr "�������ζ����ݿ�"
+
+#: g10/g10.c:413
+msgid "|algo [files]|print message digests"
+msgstr "|�㷨�� [�ļ���]|��ӡ����ɢ��ֵ��ʹ��ָ����ɢ���㷨"
+
+#: g10/g10.c:417 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"ѡ�\n"
+" "
+
+#: g10/g10.c:419
+msgid "create ascii armored output"
+msgstr "����� ASCII ��װ"
+
+#: g10/g10.c:421
+msgid "|NAME|encrypt for NAME"
+msgstr "|ij��|Ϊ�ռ��ߡ�ij�ס�����"
+
+#: g10/g10.c:432
+msgid "use this user-id to sign or decrypt"
+msgstr "ʹ������û���ʶ��ǩ�ֻ����"
+
+#: g10/g10.c:433
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|�趨ѹ���ȼ�Ϊ N(0 ��ʾ��ѹ��)"
+
+#: g10/g10.c:438
+msgid "use canonical text mode"
+msgstr "ʹ�ñ�׼���ı�ģʽ"
+
+#: g10/g10.c:448
+msgid "use as output file"
+msgstr "ָ������ļ�"
+
+#: g10/g10.c:450 g10/gpgv.c:66
+msgid "verbose"
+msgstr "��ϸģʽ"
+
+#: g10/g10.c:461
+msgid "do not make any changes"
+msgstr "��Ҫ���κθı�"
+
+#: g10/g10.c:462
+msgid "prompt before overwriting"
+msgstr "����ǰ��ѯ��"
+
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
+
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:535
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(��ο�����˵���Ի�����������ѡ��������嵥)\n"
+
+#: g10/g10.c:538
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"������\n"
+"\n"
+" -se -r Bob [�ļ���]          Ϊ Bob ����ռ���ǩ�ּ�����\n"
+" --clearsign [�ļ���]         ��������ǩ��\n"
+" --detach-sign [�ļ���]       ��������ʽǩ��\n"
+" --list-keys [ij��]           ��ʾ��Կ\n"
+" --fingerprint [ij��]         ��ʾָ��\n"
+
+#: g10/g10.c:713 g10/gpgv.c:91
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr "���� <[email protected]> �������ȱ�ݡ�\n"
+
+#: g10/g10.c:730
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "�÷��� gpg [ѡ��] [�ļ�] (�� -h ����)"
+
+#: g10/g10.c:733
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"�﷨��gpg [ѡ��] [�ļ���]\n"
+"ǩ�֡���顢���ܻ����\n"
+"Ĭ�ϵIJ������������ݶ���\n"
+
+#: g10/g10.c:744
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"֧�ֵ��㷨��\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "��Կ��"
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "�ԳƼ��ܣ�"
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "ɢ�У�"
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "ѹ����"
+
+#: g10/g10.c:848
+msgid "usage: gpg [options] "
+msgstr "�÷���gpg [ѡ��] "
+
+#: g10/g10.c:951
+msgid "conflicting commands\n"
+msgstr "��ͻ��ָ��\n"
+
+#: g10/g10.c:969
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr "�ڡ�%s���鶨�����Ҳ����Ⱥ�(=)\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
+
+#: g10/g10.c:1334
+#, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "δ֪�������%s��\n"
+
+#: g10/g10.c:1601
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "ע�⣺��ʽ��Ĭ�������ļ���%s���ѱ�����\n"
+
+#: g10/g10.c:1637
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "ע�⣺û��Ĭ�������ļ���%s��\n"
+
+#: g10/g10.c:1641
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "�����ļ���%s����%s\n"
+
+#: g10/g10.c:1648
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "�ӡ�%s����ȡѡ��\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "ע�⣺һ������²����õ� %s��\n"
+
+#: g10/g10.c:1887
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr "�ԳƼ����ܷ���չģ�顰%s����ΪȨ�޲���ȫ��δ������\n"
+
+#: g10/g10.c:2099
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s ����һ����Ч���ַ���\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "�޷�������Կ������ URI\n"
+
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "��Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2137
+msgid "invalid import options\n"
+msgstr "��Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2144
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2147
+msgid "invalid export options\n"
+msgstr "��Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "��Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "��Ч�ĵ���ѡ��\n"
+
+#: g10/g10.c:2208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "�޷�������·����� %s\n"
+
+#: g10/g10.c:2398
+msgid "WARNING: program may create a core file!\n"
+msgstr "���棺������ܻᴴ�������ڴ�ת����\n"
+
+#: g10/g10.c:2402
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "���棺%s ��ʹ�� %s ʧЧ\n"
+
+#: g10/g10.c:2411
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s ������ %s ����\n"
+
+#: g10/g10.c:2414
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s �� %s ���������壡\n"
+
+#: g10/g10.c:2435
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr "��ֻ���� --pgp2 ģʽ�²���������ʽ������ǩ��\n"
+
+#: g10/g10.c:2441
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "���� --pgp2 ģʽ��ʱ������ͬʱǩ�ֺͼ���\n"
+
+#: g10/g10.c:2447
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr "���� --pgp2 ʱ��Ӧ��ֻʹ���ļ������ǹܵ�\n"
+
+#: g10/g10.c:2460
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "�� --pgp2 ģʽ�¼��ܱ�����Ҫ IDEA �㷨\n"
+
+#: g10/g10.c:2528 g10/g10.c:2552
+msgid "selected cipher algorithm is invalid\n"
+msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
+
+#: g10/g10.c:2534 g10/g10.c:2558
+msgid "selected digest algorithm is invalid\n"
+msgstr "��ѡ��ɢ���㷨��Ч\n"
+
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
+
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "��ѡ��֤��ɢ���㷨��Ч\n"
+
+#: g10/g10.c:2561
+msgid "completes-needed must be greater than 0\n"
+msgstr "��Ҫ����ȫ����ǩ����һ��Ҫ���� 0\n"
+
+#: g10/g10.c:2563
+msgid "marginals-needed must be greater than 1\n"
+msgstr "��Ҫ����ǿ����ǩ����һ��Ҫ���� 1\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "�����֤���һ��Ҫ���� 1 �� 255 ֮��\n"
+
+#: g10/g10.c:2567
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "��Ч��Ĭ����֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
+
+#: g10/g10.c:2569
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "��Ч����С��֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
+
+#: g10/g10.c:2572
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "ע�⣺ǿ�Ҳ�����ʹ�ü򵥵� S2K ģʽ(0)\n"
+
+#: g10/g10.c:2576
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "��Ч�� S2K ģʽ�������� 0��1 �� 3\n"
+
+#: g10/g10.c:2583
+msgid "invalid default preferences\n"
+msgstr "��Ч��Ĭ����ѡ��\n"
+
+#: g10/g10.c:2592
+msgid "invalid personal cipher preferences\n"
+msgstr "��Ч�ĸ��˶ԳƼ����㷨��ѡ��\n"
+
+#: g10/g10.c:2596
+msgid "invalid personal digest preferences\n"
+msgstr "��Ч�ĸ���ɢ���㷨��ѡ��\n"
+
+#: g10/g10.c:2600
+msgid "invalid personal compress preferences\n"
+msgstr "��Ч�ĸ���ѹ���㷨��ѡ��\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s Ŀǰ�޷��� %s ����\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "�����ý��ԳƼ����㷨��%s������ %s ģʽ��\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "�����ý�ɢ���㷨��%s������ %s ģʽ��\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "�����ý�ѹ���㷨��%s������ %s ģʽ��\n"
+
+#: g10/g10.c:2778
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
+
+#: g10/g10.c:2789
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr "���棺�������ռ���(-r)����δʹ�ù�Կ����\n"
+
+#: g10/g10.c:2800
+msgid "--store [filename]"
+msgstr "--store [�ļ���]"
+
+#: g10/g10.c:2807
+msgid "--symmetric [filename]"
+msgstr "--symmetric [�ļ���]"
+
+#: g10/g10.c:2819
+msgid "--encrypt [filename]"
+msgstr "--encrypt [�ļ���]"
+
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [�ļ���]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "�����ý� %s ���� %s ģʽ��\n"
+
+#: g10/g10.c:2855
+msgid "--sign [filename]"
+msgstr "--sign [�ļ���]"
+
+#: g10/g10.c:2868
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [�ļ���]"
+
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [�ļ���]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "�����ý� %s ���� %s ģʽ��\n"
+
+#: g10/g10.c:2908
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [�ļ���]"
+
+#: g10/g10.c:2917
+msgid "--clearsign [filename]"
+msgstr "--clearsign [�ļ���]"
+
+#: g10/g10.c:2942
+msgid "--decrypt [filename]"
+msgstr "--decrypt [�ļ���]"
+
+#: g10/g10.c:2950
+msgid "--sign-key user-id"
+msgstr "--sign-key �û���ʶ"
+
+#: g10/g10.c:2954
+msgid "--lsign-key user-id"
+msgstr "--lsign-key �û���ʶ"
+
+#: g10/g10.c:2958
+msgid "--nrsign-key user-id"
+msgstr "--nrsign-key �û���ʶ"
+
+#: g10/g10.c:2962
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key �û���ʶ"
+
+#: g10/g10.c:2986
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key �û���ʶ [ָ��]"
+
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "�޷��� %s��%s\n"
+
+#: g10/g10.c:3057
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [�û���ʶ] [Կ�׻�]"
+
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "�޷����͵���Կ��������%s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "�޷��ӹ�Կ���������գ�%s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "�޷�������Կ��%s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "�޷��ڹ�Կ��������������%s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "�޷��ӹ�Կ�������ϸ��£�%s\n"
+
+#: g10/g10.c:3160
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "�⿪ ASCII ��װʧ�ܣ�%s\n"
+
+#: g10/g10.c:3168
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "���� ASCII ��װʧ�ܣ�%s\n"
+
+#: g10/g10.c:3255
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "��Ч�ġ�%s��ɢ���㷨\n"
+
+#: g10/g10.c:3378
+msgid "[filename]"
+msgstr "[�ļ���]"
+
+#: g10/g10.c:3382
+msgid "Go ahead and type your message ...\n"
+msgstr "�뿪ʼ�������ı��ġ���\n"
+
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "�޷��򿪡�%s��\n"
+
+#: g10/g10.c:3659
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr "������Ʊ���ֻ���пɴ�ӡ���ַ���ո񣬲���һ����=������β\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "�û��������һ��Ҫ���С�@���ַ�\n"
+
+#: g10/g10.c:3678
+msgid "a notation value must not use any control characters\n"
+msgstr "���ֵһ������ʹ���κεĿ����ַ�\n"
+
+#: g10/g10.c:3712
+msgid "the given certification policy URL is invalid\n"
+msgstr "�����ĵ���֤���� URL ��Ч\n"
+
+#: g10/g10.c:3714
+msgid "the given signature policy URL is invalid\n"
+msgstr "������ǩ�ֲ��� URL ��Ч\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "������ǩ�ֲ��� URL ��Ч\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "����������ʾ��Ϣ"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "�����Կ�׻���ȡ����Կ"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "��ʱ���ì�ܽ���Ϊ����"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|��״̬��Ϣд���ļ������� FD"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "�÷���gpgv [ѡ��] [�ļ�] (�� -h ����)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"�﷨��gpg [ѡ��] [�ļ�]\n"
+"����֪����������Կ�����ǩ��\n"
+
+#: g10/armor.c:317
+#, c-format
+msgid "armor: %s\n"
+msgstr "ASCII ��װ��%s\n"
+
+#: g10/armor.c:346
+msgid "invalid armor header: "
+msgstr "��Ч�� ASCII ��װͷ��"
+
+#: g10/armor.c:353
+msgid "armor header: "
+msgstr "ASCII ��װͷ��"
+
+#: g10/armor.c:364
+msgid "invalid clearsig header\n"
+msgstr "��Ч������ǩ��ͷ\n"
+
+#: g10/armor.c:416
+msgid "nested clear text signatures\n"
+msgstr "�������ǩ��\n"
+
+#: g10/armor.c:553
+msgid "invalid dash escaped line: "
+msgstr "��Ч�����ֺ������У�"
+
+#: g10/armor.c:565
+msgid "unexpected armor:"
+msgstr "��Ԥ�ڲ����� ASCII ��װ��"
+
+#: g10/armor.c:695 g10/armor.c:1276
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "������Ч�� 64 �����ַ� %02x\n"
+
+#: g10/armor.c:738
+msgid "premature eof (no CRC)\n"
+msgstr "�ļ�����Ԥ�ڽ���(û�� CRC ����)\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in CRC)\n"
+msgstr "�ļ�����Ԥ�ڽ���(CRC ����δ����)\n"
+
+#: g10/armor.c:776
+msgid "malformed CRC\n"
+msgstr "�쳣�� CRC\n"
+
+#: g10/armor.c:780 g10/armor.c:1313
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "CRC ����%06lx - %06lx\n"
+
+#: g10/armor.c:800
+msgid "premature eof (in Trailer)\n"
+msgstr "�ļ�����Ԥ�ڽ���(�ڽ�β��)\n"
+
+#: g10/armor.c:804
+msgid "error in trailer line\n"
+msgstr "���������\n"
+
+#: g10/armor.c:1091
+msgid "no valid OpenPGP data found.\n"
+msgstr "�Ҳ�����Ч�� OpenPGP ���ݡ�\n"
+
+#: g10/armor.c:1096
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "��Ч�� ASCII ��װ��һ�г��� %d �ַ�\n"
+
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr "��װ��������ϵĿɴ�ӡ�ַ�������������ȱ�ݵ��ż����������ɵ�\n"
+
+#: g10/pkclist.c:61 g10/revoke.c:576
+msgid "No reason specified"
+msgstr "δָ��ԭ��"
+
+#: g10/pkclist.c:63 g10/revoke.c:578
+msgid "Key is superseded"
+msgstr "��Կ���滻"
+
+#: g10/pkclist.c:65 g10/revoke.c:577
+msgid "Key has been compromised"
+msgstr "��Կ��й©"
+
+#: g10/pkclist.c:67 g10/revoke.c:579
+msgid "Key is no longer used"
+msgstr "��Կ����ʹ��"
+
+#: g10/pkclist.c:69 g10/revoke.c:580
+msgid "User ID is no longer valid"
+msgstr "�û���ʶ������Ч"
+
+#: g10/pkclist.c:73
+msgid "reason for revocation: "
+msgstr "����ԭ��"
+
+#: g10/pkclist.c:90
+msgid "revocation comment: "
+msgstr "����ע�ͣ�"
+
+#  a string with valid answers
+#: g10/pkclist.c:195
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
+msgstr ""
+"������Ŀû��ָ�����ζȣ�\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                �༴ \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                �༴ \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+"������λ�û���֤�����û�����Կ(�������֤��\n"
+"ͨ����ͬ���������ָ�Ƶ�)�������ж������أ�\n"
+"\n"
+
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = ��֪��\n"
+
+#: g10/pkclist.c:252
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = �Ҳ�����\n"
+
+#: g10/pkclist.c:254
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = ����ǿ����\n"
+
+#: g10/pkclist.c:256
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = ����ȫ����\n"
+
+#: g10/pkclist.c:258
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = �Ҿ�������\n"
+
+#: g10/pkclist.c:261
+msgid " i = please show me more information\n"
+msgstr " i = ������Ҹ�����Ϣ\n"
+
+#: g10/pkclist.c:264
+msgid " m = back to the main menu\n"
+msgstr " m = �ص����˵�\n"
+
+#: g10/pkclist.c:267
+msgid " s = skip this key\n"
+msgstr " s = ���������Կ\n"
+
+#: g10/pkclist.c:268
+msgid " q = quit\n"
+msgstr " q = �˳�\n"
+
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
+msgid "Your decision? "
+msgstr "���ľ�����ʲô��"
+
+#: g10/pkclist.c:299
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "�����Ҫ�������Կ��ɾ������Σ�"
+
+#: g10/pkclist.c:313
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "���������ε���Կ��֤�飺\n"
+
+#: g10/pkclist.c:387
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "��Կ %08lX���Ѿ��������ˣ�\n"
+
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
+msgid "Use this key anyway? "
+msgstr "������λ���ʹ�������Կ�� "
+
+#: g10/pkclist.c:399
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "��Կ %08lX����Կ�Ѿ��������ˣ�\n"
+
+#: g10/pkclist.c:420
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: ��Կ�Ѿ�������\n"
+
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr "%08lX��û��֤�ݱ��������Կ��������������Ƶij�����\n"
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX�����Dz����������Կ\n"
+
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "%08lX��û��֤�ݱ��������Կ��������������Ƶij�����\n"
+
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "�����Կ�п����������������\n"
+
+#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "�����Կ���������ǵ�\n"
+
+#: g10/pkclist.c:500
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+"�����Կ����һ�������û���ʶ���Ƶ��Ǹ��ˡ�\n"
+"��������֪���Լ�����ʲô��\n"
+"����������һ������ش�yes\n"
+
+#: g10/pkclist.c:514 g10/pkclist.c:544
+msgid "WARNING: Using untrusted key!\n"
+msgstr "���棺����ʹ�ò������ε���Կ��\n"
+
+#: g10/pkclist.c:551
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "���棺����Կ�����ѱ����� (������Կ������)\n"
+
+#: g10/pkclist.c:560
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "���棺�����Կ�Ѿ�������ָ�������ߵ����ˣ�\n"
+
+#: g10/pkclist.c:563
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "���棺�����Կ�Ѿ������ij����ߵ����ˣ�\n"
+
+#: g10/pkclist.c:564
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "      ��������ǩ���п�����α��ġ�\n"
+
+#: g10/pkclist.c:570
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "���棺�����Կ�Ѿ������ij����˵����ˣ�\n"
+
+#: g10/pkclist.c:575
+msgid "Note: This key has been disabled.\n"
+msgstr "ע�⣺�����Կ�Ѿ��������ˡ�\n"
+
+#: g10/pkclist.c:580
+msgid "Note: This key has expired!\n"
+msgstr "ע�⣺�����Կ�Ѿ������ˣ�\n"
+
+#: g10/pkclist.c:591
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "���棺�����Կδ�������ε�ǩ����֤��\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr "      û��֤�ݱ������ǩ�������������Ƶij����ߡ�\n"
+
+#: g10/pkclist.c:601
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "���棺���Dz����������Կ��\n"
+
+#: g10/pkclist.c:602
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "      ���ǩ�ֺ��п�����α��ġ�\n"
+
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr "���棺�����Կδ�����㹻���ζȵ�ǩ������֤��\n"
+
+#: g10/pkclist.c:612
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "      ���ǩ�ֲ���һ�������������Ƶij�����\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "�����ý� %s ���� %s ģʽ��\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s����������%s\n"
+
+#: g10/pkclist.c:787 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: ����������Կ�Ѵ���\n"
+
+#: g10/pkclist.c:829
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr "��û��ָ���û���ʶ��(�����������������á�-r��ָ��)\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+"\n"
+"�����û���ʶ���Կհ��н�����"
+
+#: g10/pkclist.c:887
+msgid "No such user ID.\n"
+msgstr "û������û���ʶ��\n"
+
+#: g10/pkclist.c:892 g10/pkclist.c:954
+msgid "skipped: public key already set as default recipient\n"
+msgstr "����������Կ�ѱ���ΪĬ���ռ���\n"
+
+#: g10/pkclist.c:910
+msgid "Public key is disabled.\n"
+msgstr "��Կ�����á�\n"
+
+#: g10/pkclist.c:917
+msgid "skipped: public key already set\n"
+msgstr "����������Կ�ѱ��趨\n"
+
+#: g10/pkclist.c:946
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "δ֪��Ĭ���ռ��ߡ�%s��\n"
+
+#: g10/pkclist.c:991
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s������������Կ�ѱ�����\n"
+
+#: g10/pkclist.c:1046
+msgid "no valid addressees\n"
+msgstr "û����Ч�ĵ�ַ\n"
+
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "��ѡ�� %c%lu �ظ�\n"
+
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "̫����ѡ�%c��\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "̫����ѡ�%c��\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "̫����ѡ�%c��\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "��ѡ���ַ���������Ч���ַ�\n"
+
+#: g10/keygen.c:738
+msgid "writing direct signature\n"
+msgstr "����д��ֱ��ǩ��\n"
+
+#: g10/keygen.c:777
+msgid "writing self signature\n"
+msgstr "����д������ǩ��\n"
+
+#: g10/keygen.c:823
+msgid "writing key binding signature\n"
+msgstr "����д����Կ��ǩ��\n"
+
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "��Կ�ߴ���Ч������ %u �ֽ�\n"
+
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "��Կ�ߴ����뵽 %u �ֽ�\n"
+
+#: g10/keygen.c:1165
+msgid "Please select what kind of key you want:\n"
+msgstr "��ѡ����Ҫʹ�õ���Կ���ࣺ\n"
+
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA �� ElGamal (Ĭ��)\n"
+
+#: g10/keygen.c:1168
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (������ǩ��)\n"
+
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (�����ڼ���)\n"
+
+#: g10/keygen.c:1171
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (������ǩ��)\n"
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (�����ڼ���)\n"
+
+#: g10/keygen.c:1175
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (����ǩ�ּ�����)\n"
+
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+msgid "Your selection? "
+msgstr "����ѡ�� "
+
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+msgid "Invalid selection.\n"
+msgstr "��Ч��ѡ��\n"
+
+#: g10/keygen.c:1225
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"��Ҫ����һ���µ�%s��Կ�ԡ�\n"
+"        ��С����Կ�ߴ���  768�ֽ�\n"
+"        Ĭ�ϵ���Կ�ߴ��� 1024�ֽ�\n"
+"    �Ƽ��������Կ�ߴ��� 2048�ֽ�\n"
+
+#: g10/keygen.c:1234
+msgid "What keysize do you want? (1024) "
+msgstr "����Ҫ�ö�����Կ�ߴ磿(1024)"
+
+#: g10/keygen.c:1239
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA����Կ�ߴ�ֻ�ܽ��� 512 �� 1024 ֮��\n"
+
+#: g10/keygen.c:1241
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "��Կ�ߴ�̫С��RSA ��Կ�ߴ�����Ҫ�� 1024��\n"
+
+#: g10/keygen.c:1244
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "��Կ�ߴ�̫С������Ҫ�� 768��\n"
+
+#: g10/keygen.c:1255
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "��Կ�ߴ�̫�����ֻ�ܹ��õ� %d��\n"
+
+#: g10/keygen.c:1260
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"������ʹ�óߴ���� 2048 ����Կ��\n"
+"��Ϊ������ĻỨȥ�ܶ�ʱ�䣡\n"
+
+#: g10/keygen.c:1263
+msgid "Are you sure that you want this keysize? "
+msgstr "��ȷ��Ҫ�������Կ�ߴ��� "
+
+#: g10/keygen.c:1264
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr "�ðɣ��������ס������Ļ�ͼ���Ҳ���൱�ױ����ӵģ�\n"
+
+#: g10/keygen.c:1273
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "����Ҫ�����Կ�ߴ��� %u �ֽ�\n"
+
+#: g10/keygen.c:1276 g10/keygen.c:1280
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "���뵽 %u �ֽ�\n"
+
+#: g10/keygen.c:1331
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+"���趨�����Կ����Ч���ޡ�\n"
+"         0 = ��Կ��������\n"
+"      <n>  = ��Կ�� n ������\n"
+"      <n>w = ��Կ�� n �ܺ����\n"
+"      <n>m = ��Կ�� n �º����\n"
+"      <n>y = ��Կ�� n ������\n"
+
+#: g10/keygen.c:1340
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"���趨���ǩ�ֵ���Ч���ޡ�\n"
+"         0 = ǩ����������\n"
+"      <n>  = ǩ���� n ������\n"
+"      <n>w = ǩ���� n �ܺ����\n"
+"      <n>m = ǩ���� n �º����\n"
+"      <n>y = ǩ���� n ������\n"
+
+#: g10/keygen.c:1362
+msgid "Key is valid for? (0) "
+msgstr "��Կ����Ч�����ǣ�(0) "
+
+#: g10/keygen.c:1364
+msgid "Signature is valid for? (0) "
+msgstr "ǩ�ֵ���Ч�����Ƕ�ã�(0) "
+
+#: g10/keygen.c:1369
+msgid "invalid value\n"
+msgstr "��Ч����ֵ\n"
+
+#: g10/keygen.c:1374
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr "%s ��Զ�������\n"
+
+#: g10/keygen.c:1381
+#, c-format
+msgid "%s expires at %s\n"
+msgstr "%s ���� %s ����\n"
+
+#: g10/keygen.c:1387
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"����ϵͳ�޷���ʾ 2038 ���Ժ�����ڡ�\n"
+"��������������ȷ���� 2106 ��֮ǰ����ݡ�\n"
+
+#: g10/keygen.c:1392
+msgid "Is this correct (y/n)? "
+msgstr "������ȷ��(y/n)"
+
+#: g10/keygen.c:1435
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"����Ҫһ���û���ʶ����ʶ������Կ��������������ʵ������\n"
+"ע�ͺ͵����ʼ���ַ��ϳ��û���ʶ��������ʾ��\n"
+"    ��Heinrich Heine (Der Dichter) <[email protected]>��\n"
+"\n"
+
+#: g10/keygen.c:1447
+msgid "Real name: "
+msgstr "��ʵ������"
+
+#: g10/keygen.c:1455
+msgid "Invalid character in name\n"
+msgstr "����������Ч���ַ�\n"
+
+#: g10/keygen.c:1457
+msgid "Name may not start with a digit\n"
+msgstr "���������������ֿ�ͷ\n"
+
+#: g10/keygen.c:1459
+msgid "Name must be at least 5 characters long\n"
+msgstr "��������Ҫ������ַ���\n"
+
+#: g10/keygen.c:1467
+msgid "Email address: "
+msgstr "�����ʼ���ַ��"
+
+#: g10/keygen.c:1478
+msgid "Not a valid email address\n"
+msgstr "�����ʼ���ַ��Ч\n"
+
+#: g10/keygen.c:1486
+msgid "Comment: "
+msgstr "ע�ͣ�"
+
+#: g10/keygen.c:1492
+msgid "Invalid character in comment\n"
+msgstr "ע�ͺ�����Ч���ַ�\n"
+
+#: g10/keygen.c:1515
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "������ʹ�á�%s���ַ�����\n"
+
+#: g10/keygen.c:1521
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"��ѡ��������û���ʶ��\n"
+"    ��%s��\n"
+"\n"
+
+#: g10/keygen.c:1526
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "�벻Ҫ�ѵ����ʼ���ַ�Ž�������ʵ������ע����\n"
+
+#: g10/keygen.c:1531
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:1541
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)���˳�(Q)��"
+
+#: g10/keygen.c:1542
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)��ȷ��(O)/�˳�(Q)��"
+
+#: g10/keygen.c:1561
+msgid "Please correct the error first\n"
+msgstr "���ȸ�������\n"
+
+#: g10/keygen.c:1600
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"����Ҫһ����������������˽Կ��\n"
+"\n"
+
+#: g10/keygen.c:1609 g10/keyedit.c:1021
+msgid "passphrase not correctly repeated; try again"
+msgstr "�����ٴ�����ʱ���״����벻����������һ��"
+
+#: g10/keygen.c:1610
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:1616
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway.  You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"������Ҫ�����롪������뷨ʵ������͸�ˣ�\n"
+"����������Ȼ���������ȥ�������κ�ʱ�򶼿��Ա���������룬\n"
+"����Ҫ�ٴ�ִ��������򣬲���ʹ�á�--edit-key��ѡ��ɡ�\n"
+"\n"
+
+#: g10/keygen.c:1638
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"������Ҫ���ɴ���������ֽڡ����ʱ�������Զ���Щ����\n"
+"(�����ô���̡��ƶ���ꡢ��дӲ��֮���)\n"
+"�����������ַ������и��õĻ������㹻��������\n"
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "��Ǹ����������ģʽ���޷���ɴ˲���\n"
+
+#: g10/keygen.c:2267
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "DSA ��Կ�Ի��� 1024 �ֽڡ�\n"
+
+#: g10/keygen.c:2335
+msgid "Key generation canceled.\n"
+msgstr "��Կ������ȡ����\n"
+
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "���ڽ���Կд��`%s'\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "���ڽ�˽Կд��`%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "���ڽ�˽Կд��`%s'\n"
+
+#: g10/keygen.c:2565
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "�Ҳ�����д�Ĺ�ԿԿ�׻���%s\n"
+
+#: g10/keygen.c:2571
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "�Ҳ�����д��˽ԿԿ�׻���%s\n"
+
+#: g10/keygen.c:2589
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "д�빫ԿԿ�׻���%s��ʱ�������� %s\n"
+
+#: g10/keygen.c:2596
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "д��˽ԿԿ�׻���%s��ʱ�������� %s\n"
+
+#: g10/keygen.c:2619
+msgid "public and secret key created and signed.\n"
+msgstr "��Կ��˽Կ�Ѿ����ɲ���ǩ�֡�\n"
+
+#: g10/keygen.c:2630
+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 ""
+"��ע�������Կ�������������ܣ����������á�--edit-key��ָ��\n"
+"�������ڼ��ܵ���Կ��\n"
+
+#: g10/keygen.c:2642 g10/keygen.c:2755
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "������Կʧ�ܣ�%s\n"
+
+#: g10/keygen.c:2691 g10/sign.c:290
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
+
+#: g10/keygen.c:2693 g10/sign.c:292
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
+
+#: g10/keygen.c:2702
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr "ע�⣺Ϊ v3 ��Կ������Կ��ʧȥ OpenPGP ������\n"
+
+#: g10/keygen.c:2730
+msgid "Really create? "
+msgstr "���Ҫ������ "
+
+#: g10/decrypt.c:98 g10/encode.c:845
+msgid "--output doesn't work for this command\n"
+msgstr "--output ����������������\n"
+
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s���޷��򿪣�%s\n"
+
+#: g10/encode.c:203 g10/sign.c:1144
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "���������ʱ��������%s\n"
+
+#: g10/encode.c:208
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "�ڴ� S2K ģʽ���޷�ʹ�öԳƵ� ESK ��\n"
+
+#: g10/encode.c:221
+#, c-format
+msgid "using cipher %s\n"
+msgstr "ʹ�öԳƼ����㷨 %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "��%s���ѱ�ѹ��\n"
+
+#: g10/encode.c:301 g10/encode.c:590
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s�����棺���ļ�\n"
+
+#: g10/encode.c:465
+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:480
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "���ڴӡ�%s����ȡ\n"
+
+#: g10/encode.c:516
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr "����Ҫ�������ܵ�������Կ������ʹ�� IDEA �㷨��\n"
+
+#: g10/encode.c:526 g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "ǿ��ʹ�õ� %s (%d)�ԳƼ����㷨�����ռ��ߵ���ѡ����\n"
+
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "ǿ��ʹ�õ� %s (%d)ѹ���㷨�����ռ��ߵ���ѡ����\n"
+
+#: g10/encode.c:818
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s �Ѿ����ܸ�����%s��\n"
+
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "�Ҳ�����%s����Կ��%s\n"
+
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "��ȡ��Կ����ʱ��������%s\n"
+
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "��Կ %08lX��δ����������������\n"
+
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "��Կ %08lX��PGP 2.x ��ʽ����Կ����������\n"
+
+#  I hope this warning doesn't confuse people.
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "���棺˽Կ %08lX �����ڼ�SK�����\n"
+
+#: g10/export.c:385
+msgid "WARNING: nothing exported\n"
+msgstr "���棺û�е����κζ���\n"
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pk ��������Ŀ̫�ࡪ���ѽ���\n"
+
+#: g10/getkey.c:186 g10/getkey.c:2693
+msgid "[User id not found]"
+msgstr "[�Ҳ����û���ʶ]"
+
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "--allow-non-selfsigned-uid ������Ч����Կ %08lX ��Ч\n"
+
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "��Կ %08lX û�����Ӧ��˽Կ�������ں���\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "ʹ����Կ %08lX ������Կ %08lX\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "��Կ %08lX��ֻ��˽Կ��û�й�Կ����������\n"
+
+#: g10/import.c:241
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "�������� %d ��ʽ������\n"
+
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "�Ѵ��� %lu ����Կ\n"
+
+#: g10/import.c:255
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "��ȡ��%s��ʱ������%s\n"
+
+#: g10/import.c:267
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "�ϼƱ�������������%lu\n"
+
+#: g10/import.c:269
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "  ������������Կ��%lu\n"
+
+#: g10/import.c:272
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "  ��ʧ���û���ʶ��%lu\n"
+
+#: g10/import.c:274
+#, c-format
+msgid "              imported: %lu"
+msgstr "          �ѵ��룺%lu"
+
+#: g10/import.c:280
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "          δ�ı䣺%lu\n"
+
+#: g10/import.c:282
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "      ���û���ʶ��%lu\n"
+
+#: g10/import.c:284
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "        �µ���Կ��%lu\n"
+
+#: g10/import.c:286
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "        �µ�ǩ�֣�%lu\n"
+
+#: g10/import.c:288
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "    �µ���Կ������%lu\n"
+
+#: g10/import.c:290
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "      ��ȡ��˽Կ��%lu\n"
+
+#: g10/import.c:292
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "      �����˽Կ��%lu\n"
+
+#: g10/import.c:294
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr "    δ�ı��˽Կ��%lu\n"
+
+#: g10/import.c:296
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr "        δ�����룺%lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%sǩ�֣�ɢ���㷨 %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "��Կ %08lX��û���û���ʶ\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "��Կ %08lX������� HKP ��Կ�ѱ��޸�\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "��Կ %08lX����������ǩ�ֵ��û���ʶ��%s���ѱ�����\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "��Կ %08lX��û����Ч���û���ʶ\n"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "���������ʧ����ǩ������\n"
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "��Կ %08lX���Ҳ�����Կ��%s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "��Կ %08lX������Կ����������\n"
+
+#: g10/import.c:755
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "�Ҳ�����д��Կ�׻���%s\n"
+
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "����д�롮%s��\n"
+
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "д��Կ�׻���%s��ʱ������ %s\n"
+
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "��Կ %08lX����Կ��%s���ѵ���\n"
+
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "��Կ %08lX�������ǵĸ������Ǻ�\n"
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "��Կ %08lX���޷���λԭʼ����Կ���飺%s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "��Կ %08lX���޷���ȡԭʼ����Կ���飺 %s\n"
+
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "��Կ %08lX����%s��һ���µ��û���ʶ\n"
+
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "��Կ %08lX����%s��%d ���µ��û���ʶ\n"
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "��Կ %08lX����%s��1 ���µ�ǩ��\n"
+
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "��Կ %08lX����%s��%d ���µ�ǩ��\n"
+
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "��Կ %08lX����%s��1 ���µ���Կ\n"
+
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "��Կ %08lX����%s��%d ���µ���Կ\n"
+
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "��Կ %08lX����%s��û�б��ı�\n"
+
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "��Կ %08lX��˽Կʹ������Ч�ļ����㷨 %d����������\n"
+
+#: g10/import.c:1064
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "û��Ĭ�ϵ�˽ԿԿ�׻��� %s\n"
+
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "��Կ %08lX��˽Կ�ѵ���\n"
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "��Կ %08lX������˽ԿԿ�׻�����\n"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "��Կ %08lX���Ҳ���˽Կ��%s\n"
+
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr "��Կ %08lX��û�й�Կ�����޷�Ӧ�õ���֤��\n"
+
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "��Կ %08lX����Ч�ĵ���֤�飺%s�����ܾ�\n"
+
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "��Կ %08lX����%s������֤���ѱ�����\n"
+
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "��Կ %08lX��ǩ��û���û���ʶ\n"
+
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "��Կ %08lX���û���ʶ��%s��ʹ���˲�֧�ֵĹ�Կ�㷨\n"
+
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "��Կ %08lX���û���ʶ��%s������ǩ����Ч\n"
+
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "��Կ %08lX��û�пɹ��󶨵���Կ\n"
+
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "��Կ %08lX����֧�ֵĹ�Կ�㷨\n"
+
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "��Կ %08lX����Ч����Կ��\n"
+
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "��Կ %08lX��������Կ���ѱ�ɾ��\n"
+
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "��Կ %08lX��û��������Կ��������Կ\n"
+
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "��Կ %08lX����Ч����Կ����\n"
+
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "��Կ %08lX��������Կ������ɾ��\n"
+
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "��Կ %08lX���������û���ʶ��"
+
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "��Կ %08lX����Կ������\n"
+
+#  here we violate the rfc a bit by still allowing
+#  * 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:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "��Կ %08lX�����ɵ�����ǩ��(�ȼ� %02x)����������\n"
+
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "��Կ %08lX������֤��λ�ô��󡪡�������\n"
+
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "��Կ %08lX����Ч�ĵ���֤�飺%s����������\n"
+
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "��Կ %08lX����Կǩ��λ�ô��󡪡�������\n"
+
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "��Կ %08lX����Ԥ�ڲ�����ǩ�ֵȼ�(0x%02X)����������\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "��Կ %08lX����⵽�ظ����û���ʶ�����Ѻϲ�\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "���棺��Կ %08lX ���ܱ������ˣ�����ȡ�ص�����Կ %08lX\n"
+
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "���棺��Կ %08lX ���ܱ������ˣ�������Կ %08lX �����ڡ�\n"
+
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "��Կ %08lX������������֤�顰%s��\n"
+
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "��Կ %08lX��������ֱ����Կǩ��\n"
+
+#: g10/keyedit.c:159
+msgid "[revocation]"
+msgstr "[����]"
+
+#: g10/keyedit.c:160
+msgid "[self-signature]"
+msgstr "[����ǩ��]"
+
+#: g10/keyedit.c:237 g10/keylist.c:319
+msgid "1 bad signature\n"
+msgstr "1 ���𻵵�ǩ��\n"
+
+#: g10/keyedit.c:239 g10/keylist.c:321
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d ���𻵵�ǩ��\n"
+
+#: g10/keyedit.c:241 g10/keylist.c:323
+msgid "1 signature not checked due to a missing key\n"
+msgstr "�� 1 ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
+
+#: g10/keyedit.c:243 g10/keylist.c:325
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "�� %d ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
+
+#: g10/keyedit.c:245 g10/keylist.c:327
+msgid "1 signature not checked due to an error\n"
+msgstr "�� 1 ��ǩ����Ϊij�������δ�����\n"
+
+#: g10/keyedit.c:247 g10/keylist.c:329
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "�� %d ��ǩ����ΪijЩ�����δ�����\n"
+
+#: g10/keyedit.c:249
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "��⵽ 1 ��û����Ч����ǩ�ֵ��û���ʶ\n"
+
+#: g10/keyedit.c:251
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "��⵽ %d ��û����Ч����ǩ�ֵ��û���ʶ\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = ����ǿ����\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = ����ȫ����\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "�û���ʶ��%s���ѱ�������"
+
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "����Ȼ��ҪΪ��ǩ����(y/N)"
+
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
+msgid "  Unable to sign.\n"
+msgstr "  �޷�����ǩ�֡�\n"
+
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�û���ʶ��%s���ѹ��ڡ�"
+
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "���棺�û���ʶ��%s����������ǩ�֡�"
+
+#: g10/keyedit.c:584
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"��%s���������ǩ��\n"
+"�� PGP 2.x ��ʽ��ǩ�֡�\n"
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "���Ƿ���Ҫ���������� OpenPGP ������ǩ�֣�(y/N)"
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"��ĿǰΪ��%s����ǩ��\n"
+"�Ѿ������ˡ�\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "����Ҫ����һ���µ�ǩ����ȡ���ѹ��ڵ���һ����(y/N)"
+
+#: g10/keyedit.c:632
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"��Ŀǰ�ڡ�%s����ǩ��\n"
+"��һ�ݱ���ǩ�֡�\n"
+
+#: g10/keyedit.c:636
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "���Ƿ���Ҫ���������ɿ�����ȫ������ǩ�֣�(y/N)"
+
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "��%s���Ѿ���Կ %08lX �ڱ���ǩ��\n"
+
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "��%s���Ѿ���Կ %08lX ǩ��\n"
+
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "����Ȼ��ҪΪ���ٴ�ǩ����(y/N)"
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "û�ж�����������Կ %08lX ǩ��\n"
+
+#: g10/keyedit.c:702
+msgid "This key has expired!"
+msgstr "�����Կ�Ѿ����ڣ�"
+
+#: g10/keyedit.c:722
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "�����Կ���� %s ���ڡ�\n"
+
+#: g10/keyedit.c:726
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "����Ҫ������ǩ��Ҳͬʱ������ (Y/n) "
+
+#: g10/keyedit.c:759
+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:761
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "����������Կ�� PGP 2.x ģʽ�²���ʹ�á�\n"
+
+#: g10/keyedit.c:786
+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 ""
+"���ж�ô�����ؼ�����Ҫǩ�ֵ���Կ�Ƿ�ȷʵ�������������Ƶ��������أ�\n"
+"�������֪���������Ĵ𰸣������롰0����\n"
+
+#: g10/keyedit.c:791
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr "   (0) �Ҳ����� %s\n"
+
+#: g10/keyedit.c:793
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr "   (1) �Ҹ���û�м����� %s\n"
+
+#: g10/keyedit.c:795
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr "   (2) ����������� %s\n"
+
+#: g10/keyedit.c:797
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) �ҷdz�С�ĵؼ����� %s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "����ѡ��(���� ��?�� �Ի�ø������Ϣ)��"
+
+#: g10/keyedit.c:826
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"�����ȷ��Ҫǩ�������Կ\n"
+"ʹ��������Կ��\""
+
+#: g10/keyedit.c:835
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"\n"
+"�⽫��������ǩ�֡�\n"
+
+#: g10/keyedit.c:839
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"���棺���ǩ�ֲ��ᱻ���Ϊ���ɵ�����\n"
+
+#: g10/keyedit.c:844
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"���棺���ǩ�ֲ��ᱻ��dzɲ��ɵ�����\n"
+
+#: g10/keyedit.c:851
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
+
+#: g10/keyedit.c:855
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
+
+#: g10/keyedit.c:860
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+"\n"
+"�Ҹ���û�м��������Կ��\n"
+
+#: g10/keyedit.c:864
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+"\n"
+"��������������Կ��\n"
+
+#: g10/keyedit.c:868
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+"\n"
+"�ҷdz�С�ĵؼ��������Կ��\n"
+
+#: g10/keyedit.c:877
+msgid "Really sign? "
+msgstr "���Ҫǩ���� "
+
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "ǩ��ʱʧ�ܣ� %s\n"
+
+#: g10/keyedit.c:978
+msgid "This key is not protected.\n"
+msgstr "�����Կû�б�������\n"
+
+#: g10/keyedit.c:982
+msgid "Secret parts of primary key are not available.\n"
+msgstr "��Կ��˽Կ�����޷�ȡ�á�\n"
+
+#: g10/keyedit.c:986
+msgid "Key is protected.\n"
+msgstr "��Կ�������ˡ�\n"
+
+#: g10/keyedit.c:1006
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "�޷��༭�����Կ�� %s\n"
+
+#: g10/keyedit.c:1012
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"����Ҫ�����˽Կ�õ������롣\n"
+"\n"
+
+#: g10/keyedit.c:1026
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"������Ҫ�����롪�������Ǹ������⣡\n"
+"\n"
+
+#: g10/keyedit.c:1029
+msgid "Do you really want to do this? "
+msgstr "�������Ҫ��ô���� "
+
+#: g10/keyedit.c:1095
+msgid "moving a key signature to the correct place\n"
+msgstr "���ڰ���Կ��ǩ���ƶ�����ȷ��λ��ȥ\n"
+
+#: g10/keyedit.c:1138
+msgid "quit this menu"
+msgstr "�뿪����˵�"
+
+#: g10/keyedit.c:1139
+msgid "q"
+msgstr "q"
+
+#: g10/keyedit.c:1140
+msgid "save"
+msgstr "save"
+
+#: g10/keyedit.c:1140
+msgid "save and quit"
+msgstr "���沢�뿪"
+
+#: g10/keyedit.c:1141
+msgid "help"
+msgstr "help"
+
+#: g10/keyedit.c:1141
+msgid "show this help"
+msgstr "��ʾ�������˵��"
+
+#: g10/keyedit.c:1143
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:1143
+msgid "show fingerprint"
+msgstr "��ʾָ��"
+
+#: g10/keyedit.c:1144
+msgid "list"
+msgstr "list"
+
+#: g10/keyedit.c:1144
+msgid "list key and user IDs"
+msgstr "�г���Կ���û���ʶ"
+
+#: g10/keyedit.c:1145
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:1146
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:1146
+msgid "select user ID N"
+msgstr "ѡ���û���ʶN"
+
+#: g10/keyedit.c:1147
+msgid "key"
+msgstr "key"
+
+#: g10/keyedit.c:1147
+msgid "select secondary key N"
+msgstr "ѡ����Կ N"
+
+#: g10/keyedit.c:1148
+msgid "check"
+msgstr "check"
+
+#: g10/keyedit.c:1148
+msgid "list signatures"
+msgstr "�г�ǩ��"
+
+#: g10/keyedit.c:1149
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:1150
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:1150
+msgid "sign the key"
+msgstr "Ϊ��Կ����ǩ��"
+
+#: g10/keyedit.c:1151
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "����һ�ݷ����ǩ��"
+
+#: g10/keyedit.c:1153
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:1153
+msgid "sign the key locally"
+msgstr "Ϊ��Կ���ӱ���ǩ��"
+
+#: g10/keyedit.c:1154
+msgid "nrsign"
+msgstr "nrsign"
+
+#: g10/keyedit.c:1154
+msgid "sign the key non-revocably"
+msgstr "Ϊ��Կ���Ӳ��ɵ���ǩ��"
+
+#: g10/keyedit.c:1155
+msgid "nrlsign"
+msgstr "nrlsign"
+
+#: g10/keyedit.c:1155
+msgid "sign the key locally and non-revocably"
+msgstr "Ϊ��Կ���Ӳ��ɵ����ı���ǩ��"
+
+#: g10/keyedit.c:1156
+msgid "debug"
+msgstr "debug"
+
+#: g10/keyedit.c:1157
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:1157
+msgid "add a user ID"
+msgstr "����һ���û���ʶ"
+
+#: g10/keyedit.c:1158
+msgid "addphoto"
+msgstr "addphoto"
+
+#: g10/keyedit.c:1158
+msgid "add a photo ID"
+msgstr "����һ����Ƭ��ʶ"
+
+#: g10/keyedit.c:1159
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:1159
+msgid "delete user ID"
+msgstr "ɾ��һ���û�/��Ƭ��ʶ"
+
+#: g10/keyedit.c:1161
+msgid "delphoto"
+msgstr "delphoto"
+
+#: g10/keyedit.c:1162
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1162
+msgid "add a secondary key"
+msgstr "����һ����Կ"
+
+#: g10/keyedit.c:1163
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:1163
+msgid "delete a secondary key"
+msgstr "ɾ��һ����Կ"
+
+#: g10/keyedit.c:1164
+msgid "addrevoker"
+msgstr "addrevoker"
+
+#: g10/keyedit.c:1164
+msgid "add a revocation key"
+msgstr "����һ�ѵ�����Կ"
+
+#: g10/keyedit.c:1165
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:1165
+msgid "delete signatures"
+msgstr "ɾ��ǩ��"
+
+#: g10/keyedit.c:1166
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:1166
+msgid "change the expire date"
+msgstr "����ʹ������"
+
+#: g10/keyedit.c:1167
+msgid "primary"
+msgstr "primary"
+
+#: g10/keyedit.c:1167
+msgid "flag user ID as primary"
+msgstr "�趨��ѡ�û���ʶ"
+
+#: g10/keyedit.c:1168
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:1168
+msgid "toggle between secret and public key listing"
+msgstr "��˽Կ�͹�Կ�嵥���л�"
+
+#: g10/keyedit.c:1170
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:1171
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:1171
+msgid "list preferences (expert)"
+msgstr "�г���ѡ��(ר��ģʽ)"
+
+#: g10/keyedit.c:1172
+msgid "showpref"
+msgstr "showpref"
+
+#: g10/keyedit.c:1172
+msgid "list preferences (verbose)"
+msgstr "�г���ѡ��(��ϸģʽ)"
+
+#: g10/keyedit.c:1173
+msgid "setpref"
+msgstr "setpref"
+
+#: g10/keyedit.c:1173
+msgid "set preference list"
+msgstr "�趨��ѡ��"
+
+#: g10/keyedit.c:1174
+msgid "updpref"
+msgstr "updpref"
+
+#: g10/keyedit.c:1174
+msgid "updated preferences"
+msgstr "���¹�����ѡ��"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "��Կ����������"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "�޷�������Կ������ URI\n"
+
+#: g10/keyedit.c:1176
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:1176
+msgid "change the passphrase"
+msgstr "��������"
+
+#: g10/keyedit.c:1177
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:1177
+msgid "change the ownertrust"
+msgstr "�������ζ�"
+
+#: g10/keyedit.c:1178
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:1178
+msgid "revoke signatures"
+msgstr "����ǩ��"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "����һ���û���ʶ"
+
+#: g10/keyedit.c:1180
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:1180
+msgid "revoke a secondary key"
+msgstr "����һ����Կ"
+
+#: g10/keyedit.c:1181
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:1181
+msgid "disable a key"
+msgstr "����һ����Կ"
+
+#: g10/keyedit.c:1182
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:1182
+msgid "enable a key"
+msgstr "����һ����Կ"
+
+#: g10/keyedit.c:1183
+msgid "showphoto"
+msgstr "showphoto"
+
+#: g10/keyedit.c:1183
+msgid "show photo ID"
+msgstr "��ʾ��Ƭ��ʶ"
+
+#: g10/keyedit.c:1202 g10/delkey.c:120
+msgid "can't do that in batchmode\n"
+msgstr "�ò����޷���������ģʽ�н���\n"
+
+#: g10/keyedit.c:1233
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "��ȡ��Կ���顮%s��ʱ������%s\n"
+
+#: g10/keyedit.c:1250
+msgid "Secret key is available.\n"
+msgstr "˽Կ���á�\n"
+
+#: g10/keyedit.c:1282
+msgid "Command> "
+msgstr "����> "
+
+#: g10/keyedit.c:1312
+msgid "Need the secret key to do this.\n"
+msgstr "Ҫ��˽Կ������ô����\n"
+
+#: g10/keyedit.c:1316
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "����ʹ�á�toggle��ָ�\n"
+
+#: g10/keyedit.c:1364
+msgid "Key is revoked."
+msgstr "��Կ�ѱ�������"
+
+#: g10/keyedit.c:1383
+msgid "Really sign all user IDs? "
+msgstr "���Ϊ���е��û���ʶǩ���� "
+
+#: g10/keyedit.c:1384
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "��ʾ��ѡ��Ҫ����ǩ�ֵ��û���ʶ\n"
+
+#: g10/keyedit.c:1409
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "�� %s ģʽ�в�����ʹ�����ָ�\n"
+
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+msgid "You must select at least one user ID.\n"
+msgstr "�����ٵ�ѡ��һ���û���ʶ��\n"
+
+#: g10/keyedit.c:1433
+msgid "You can't delete the last user ID!\n"
+msgstr "������ɾ�����һ���û���ʶ��\n"
+
+#: g10/keyedit.c:1436
+msgid "Really remove all selected user IDs? "
+msgstr "���Ҫɾ�����б�ѡ����û���ʶ�� "
+
+#: g10/keyedit.c:1437
+msgid "Really remove this user ID? "
+msgstr "���Ҫɾ������û���ʶ�� "
+
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
+msgid "You must select at least one key.\n"
+msgstr "������ѡ������һ����Կ��\n"
+
+#: g10/keyedit.c:1478
+msgid "Do you really want to delete the selected keys? "
+msgstr "�������Ҫɾ����ѡ�����Կ�� "
+
+#: g10/keyedit.c:1479
+msgid "Do you really want to delete this key? "
+msgstr "�����Ҫɾ�������Կ�� "
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "���Ҫ�������б�ѡ����û���ʶ�� "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "���Ҫ��������û���ʶ�� "
+
+#: g10/keyedit.c:1534
+msgid "Do you really want to revoke the selected keys? "
+msgstr "�������Ҫ������Щ��ѡ�����Կ�� "
+
+#: g10/keyedit.c:1535
+msgid "Do you really want to revoke this key? "
+msgstr "�������Ҫ���������Կ�� "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "�趨��ѡ��"
+
+#: g10/keyedit.c:1612
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "���Ҫ���±�ѡ���û���ʶ����ѡ���� "
+
+#: g10/keyedit.c:1614
+msgid "Really update the preferences? "
+msgstr "���Ҫ������ѡ���� "
+
+#: g10/keyedit.c:1662
+msgid "Save changes? "
+msgstr "Ҫ����䶯�� "
+
+#: g10/keyedit.c:1665
+msgid "Quit without saving? "
+msgstr "Ҫ��������뿪�� "
+
+#: g10/keyedit.c:1675
+#, c-format
+msgid "update failed: %s\n"
+msgstr "����ʧ�ܣ�%s\n"
+
+#: g10/keyedit.c:1682
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "����˽Կʧ�ܣ�%s\n"
+
+#: g10/keyedit.c:1689
+msgid "Key not changed so no update needed.\n"
+msgstr "��Կû�б䶯���Բ���Ҫ���¡�\n"
+
+#: g10/keyedit.c:1701
+msgid "Invalid command  (try \"help\")\n"
+msgstr "��Ч��ָ��(���ԡ�help��)\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "ɢ�У�"
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "�ص㣺"
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr "�����Կ�ɱ��� %s ��Կ������"
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr " (���е�)"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "�޷����� %s��%s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[�ѵ���]"
+
+#  of subkey
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [��������%s]"
+
+#  of subkey
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [��������%s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " ���ζȣ� %c/%c"
+
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
+msgid "This key has been disabled"
+msgstr "�����Կ�Ѿ�������"
+
+#: g10/keyedit.c:2146
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! ��Կ�Ѿ���������%s\n"
+
+#: g10/keyedit.c:2149
+msgid "rev- faked revocation found\n"
+msgstr "rev- ����α��ĵ���\n"
+
+#: g10/keyedit.c:2151
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? ������ʱ�������⣺%s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[�ѵ���]"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "PGP 2.x ��ʽ���û���ʶû����ѡ�\n"
+
+#: g10/keyedit.c:2207
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"��ע�⣬������������֮ǰ��\n"
+"��ʾ����Կ��Ч��δ����ȷ��\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[�ѵ���]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[�ѹ���]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"���棺û��һ���û���ʶ�����Ϊ��ѡ�û���ʶ����������ܼٶ�һ����ͬ\n"
+"      ���û���ʶ����ѡ�û���ʶ��\n"
+
+#: g10/keyedit.c:2399
+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 ""
+"���棺����һ�� PGP2 ��ʽ����Կ��\n"
+"      ������Ƭ��ʶ���ܻᵼ��ijЩ�汾�� PGP ����ʶ�������Կ��\n"
+
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "��ȷ����Ȼ��Ҫ������(y/N)"
+
+#: g10/keyedit.c:2410
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "�������԰���Ƭ��ʶ���ӵ� PGP2 ��ʽ����Կ�\n"
+
+#: g10/keyedit.c:2545
+msgid "Delete this good signature? (y/N/q)"
+msgstr "ɾ�������õ�ǩ����(y/N/q)"
+
+#: g10/keyedit.c:2555
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "ɾ�������Ч��ǩ����(y/N/q)"
+
+#: g10/keyedit.c:2559
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "ɾ�����δ֪��ǩ����(y/N/q)"
+
+#: g10/keyedit.c:2565
+msgid "Really delete this self-signature? (y/N)"
+msgstr "���Ҫɾ���������ǩ����(y/N)"
+
+#: g10/keyedit.c:2579
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
+
+#: g10/keyedit.c:2580
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
+
+#: g10/keyedit.c:2583
+msgid "Nothing deleted.\n"
+msgstr "û�ж�����ɾ����\n"
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"���棺����һ�� PGP2 ��ʽ����Կ��\n"
+"     ����ָ�������߿��ܻᵼ��ijЩ�汾�� PGP �޷�ʶ�������Կ��\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "��������Ϊ PGP 2.x ��ʽ����Կ����ָ�������ߡ�\n"
+
+#: g10/keyedit.c:2703
+msgid "Enter the user ID of the designated revoker: "
+msgstr "����ָ�������ߵ��û���ʶ��"
+
+#: g10/keyedit.c:2726
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "�޷��� PGP 2.x ��ʽ����Կ��Ϊָ��������\n"
+
+#  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:2741
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "�����ܽ�ij����Կ��Ϊ���Լ���ָ��������\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "���棺�����Կ�Ѿ�������ָ�������ߵ����ˣ�\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "���棺��ij����Կָ��Ϊָ�������ߵIJ����޷�������\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "��ȷ��Ҫ�������Կ��Ϊָ����������(y/N)��"
+
+#: g10/keyedit.c:2849
+msgid "Please remove selections from the secret keys.\n"
+msgstr "���˽Կ��ɾ��ѡ��\n"
+
+#: g10/keyedit.c:2855
+msgid "Please select at most one secondary key.\n"
+msgstr "������ѡ��һ����Կ��\n"
+
+#: g10/keyedit.c:2859
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
+
+#: g10/keyedit.c:2862
+msgid "Changing expiration time for the primary key.\n"
+msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
+
+#: g10/keyedit.c:2908
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "�����ܱ��v3��Կ��ʹ������\n"
+
+#: g10/keyedit.c:2924
+msgid "No corresponding signature in secret ring\n"
+msgstr "��˽Կ����û��һ�µ�ǩ��\n"
+
+#: g10/keyedit.c:3004
+msgid "Please select exactly one user ID.\n"
+msgstr "�뾫ȷ��ѡ��һ���û���ʶ��\n"
+
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "���������û���ʶ��%s���� v3 ����ǩ��\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "û������Ϊ %d ���û���ʶ\n"
+
+#: g10/keyedit.c:3377
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "û������Ϊ %d ����Կ\n"
+
+#: g10/keyedit.c:3491
+msgid "user ID: \""
+msgstr "�û���ʶ����"
+
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %s at %s\n"
+msgstr ""
+"��\n"
+"�Ѿ�ʹ��������Կ %08lX �� %s ����ǩ��\n"
+
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %s at %s\n"
+msgstr ""
+"��\n"
+"�Ѿ�ʹ��������Կ %08lX �� %s ���ӱ���ǩ��\n"
+
+#: g10/keyedit.c:3504
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "���ǩ������ %s ���ڡ�\n"
+
+#: g10/keyedit.c:3508
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "��ȷ������Ȼ��Ҫ��������(y/N)"
+
+#: g10/keyedit.c:3512
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "ҪΪ���ǩ������һ�ݵ���֤����(y/N)"
+
+#: g10/keyedit.c:3537
+msgid "You have signed these user IDs:\n"
+msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
+
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   �� %08lX �� %s%s%s ����ǩ��\n"
+
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   �� %08lX ������ %s\n"
+
+#: g10/keyedit.c:3587
+msgid "You are about to revoke these signatures:\n"
+msgstr "�����ڵ�����Щǩ�֣�\n"
+
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr "   �� %08lX �� %s%s ����ǩ��\n"
+
+#: g10/keyedit.c:3599
+msgid " (non-exportable)"
+msgstr " (���ɵ���)"
+
+#: g10/keyedit.c:3606
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "���Ҫ���ɵ���֤����(y/N)"
+
+#: g10/keyedit.c:3636
+msgid "no secret key\n"
+msgstr "û��˽Կ\n"
+
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "�û���ʶ��%s���Ѿ���������\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "���棺��һ���û���ʶǩ�ֵ����ڱ��Ϊ %d ����δ��\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "������ʾ %s ��Ƭ��ʶ(��СΪ %ld��������Կ 0x%08lX���û���ʶ %d)\n"
+
+#: g10/keylist.c:179
+msgid "Critical signature policy: "
+msgstr "�ؼ�ǩ�ֲ��ԣ�"
+
+#: g10/keylist.c:181
+msgid "Signature policy: "
+msgstr "ǩ�ֲ��ԣ�"
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
+msgid "WARNING: invalid notation data found\n"
+msgstr "���棺�ҵ���Ч�ı������\n"
+
+#: g10/keylist.c:286
+msgid "Critical signature notation: "
+msgstr "�ؼ�ǩ�ֱ�ǣ�"
+
+#: g10/keylist.c:288
+msgid "Signature notation: "
+msgstr "ǩ�ֱ�ǣ�"
+
+#: g10/keylist.c:299
+msgid "not human readable"
+msgstr "���������ܶ�����"
+
+#: g10/keylist.c:400
+msgid "Keyring"
+msgstr "Կ�׻�"
+
+#  of subkey
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [��������%s]"
+
+#  of subkey
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
+msgid " [expires: %s]"
+msgstr " [��������%s]"
+
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[�ѵ���]"
+
+#: g10/keylist.c:1357
+msgid "Primary key fingerprint:"
+msgstr "��Կָ�ƣ�"
+
+#: g10/keylist.c:1359
+msgid "     Subkey fingerprint:"
+msgstr "��Կָ�ƣ�"
+
+#: g10/keylist.c:1366
+msgid " Primary key fingerprint:"
+msgstr " ��Կָ�ƣ�"
+
+#: g10/keylist.c:1368
+msgid "      Subkey fingerprint:"
+msgstr " ��Կָ�ƣ�"
+
+#  use tty
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr " ��Կָ�� ="
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "���ܹ��ĻỰ��Կ�ߴ�(%d)����\n"
+
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "����������δ֪�ĶԳƼ����㷨 (%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s ���ܹ��ĻỰ��Կ\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s ���ܹ�������\n"
+
+#: g10/mainproc.c:305 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "��δ֪���㷨 %d ����\n"
+
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "��δ֪���㷨 %d ����\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "��Կ�� %08lX\n"
+
+#: g10/mainproc.c:428
+msgid "public key encrypted data: good DEK\n"
+msgstr "��Կ���ܹ������ݣ���õ� DEK\n"
+
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "�ó���Ϊ %u �ֽڡ�����Ϊ %s��Կ�׺�Ϊ %08lX�������� %s ����Կ���ܹ�\n"
+
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "������Ϊ %s��Կ�׺�Ϊ %08lX ����Կ���ܹ�\n"
+
+#: g10/mainproc.c:486
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "��Կ����ʧ�ܣ�%s\n"
+
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "�� %lu ���������\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "�� 1 ���������\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "�ٶ� %s Ϊ���ܹ�������\n"
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "IDEA �㷨�����ã����� %s ����\n"
+
+#: g10/mainproc.c:570
+msgid "decryption okay\n"
+msgstr "���ܳɹ�\n"
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "���棺����δ�ܵ������ı���\n"
+
+#: g10/mainproc.c:587
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "���棺���ܹ��ı����Ѿ����죡\n"
+
+#: g10/mainproc.c:593
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "����ʧ�ܣ�%s\n"
+
+#: g10/mainproc.c:613
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "ע�⣺������Ҫ������ֻ�Ķ������̡�\n"
+
+#: g10/mainproc.c:615
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "ԭʼ�ļ��� =��%.*s��\n"
+
+#: g10/mainproc.c:787
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "�����ĵ���֤�顪�����á�gpg --import����Ӧ��\n"
+
+#: g10/mainproc.c:1283
+msgid "signature verification suppressed\n"
+msgstr "ǩ����֤�ѱ�����\n"
+
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
+msgid "can't handle these multiple signatures\n"
+msgstr "�޷�������Щ����ǩ��\n"
+
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "���ǩ������ %s ���ڡ�\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                �༴ \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "�� %.*s ������ǩ�֣�ʹ�� %s��Կ�׺� %08lX\n"
+
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "��Կ��ȡ�ԣ�"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr "���𻵵�ǩ�֣�������\""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
+msgid "Expired signature from \""
+msgstr "���ڵ�ǩ�֣�������\""
+
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
+msgid "Good signature from \""
+msgstr "��õ�ǩ�֣�������\""
+
+#: g10/mainproc.c:1510
+msgid "[uncertain]"
+msgstr "[��ȷ��]"
+
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                �༴ \""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "���ǩ������ %s ���ڡ�\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "���ǩ���� %s ���ڡ�\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%sǩ�֣�ɢ���㷨 %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "������"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "�ı�ģʽ"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "δ֪"
+
+#: g10/mainproc.c:1668
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "�޷����ǩ�֣�%s\n"
+
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
+msgid "not a detached signature\n"
+msgstr "����һ�ݷ����ǩ��\n"
+
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "���棺��⵽����ǩ�֡�ֻ����һ��ǩ�֡�\n"
+
+#: g10/mainproc.c:1787
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "�ȼ� 0x%02x �Ķ���ǩ��\n"
+
+#: g10/mainproc.c:1844
+msgid "old style (PGP 2.x) signature\n"
+msgstr "��ʽ(PGP 2.x)ǩ��\n"
+
+#: g10/mainproc.c:1854
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "�� proc_tree() �м�⵽��Ч�ĸ���\n"
+
+#: g10/misc.c:82
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "�޷����ú����ڴ�ת����%s\n"
+
+#: g10/misc.c:146
+msgid "Experimental algorithms should not be used!\n"
+msgstr "��Ӧʹ��ʵ���Ե��㷨��\n"
+
+#: g10/misc.c:176
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr "���Ƽ�ʹ����������㷨���뻻�ø����ϱ�׼���㷨��\n"
+
+#: g10/misc.c:282
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "IDEA �㷨���������\n"
+
+#: g10/misc.c:283
+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/misc.c:491
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d�����鲻ʹ�õ�ѡ�%s��\n"
+
+#: g10/misc.c:495
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "���棺��%s��ѡ���Ѳ�����ʹ��\n"
+
+#: g10/misc.c:497
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "���ԡ�%s%s������\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "δ��ѹ��"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "δ��ѹ��"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "%s Ҳ������ʹ���������\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "�ӡ�%s����ȡѡ��\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "δ֪��Ĭ���ռ��ߡ�%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:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "���棺����DZ�ڰ�ȫ��в�ĶԳƼ��ܻỰ��Կ\n"
+
+#: g10/parse-packet.c:1128
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "%d �����Ӱ��趨�˹ؼ��ֽ�\n"
+
+#: g10/passphrase.c:461 g10/passphrase.c:508
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent �ڴ˴��Ự���޷�ʹ��\n"
+
+#: g10/passphrase.c:469
+msgid "can't set client pid for the agent\n"
+msgstr "�޷��趨��������ͻ��˵Ľ��̱�ʶ\n"
+
+#: g10/passphrase.c:477
+msgid "can't get server read FD for the agent\n"
+msgstr "�޷�ȡ�ô�����������ķ�������ȡ�ļ�������\n"
+
+#: g10/passphrase.c:484
+msgid "can't get server write FD for the agent\n"
+msgstr "�޷�ȡ�ô�����������ķ�����д���ļ�������\n"
+
+#: g10/passphrase.c:517
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "GPG_AGENT_INFO ����������ʽ����\n"
+
+#: g10/passphrase.c:530
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "��֧�� gpg-agent Э��汾 %d\n"
+
+#: g10/passphrase.c:551
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "�޷���������%s����%s\n"
+
+#: g10/passphrase.c:573
+msgid "communication problem with gpg-agent\n"
+msgstr "�� gpg-agent ͨѶ������\n"
+
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+msgid "problem with the agent - disabling agent use\n"
+msgstr "������������⡪������ͣ�ô�������\n"
+
+#: g10/passphrase.c:681
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr "(��Կ�׺� %08lX)"
+
+#: g10/passphrase.c:691
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"����Ҫ�����û����������⿪˽Կ��\n"
+"��%.*s��\n"
+"%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s%s\n"
+
+#: g10/passphrase.c:713
+msgid "Repeat passphrase\n"
+msgstr "��������һ������\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "����������\n"
+
+#: g10/passphrase.c:753
+msgid "passphrase too long\n"
+msgstr "����̫��\n"
+
+#: g10/passphrase.c:766
+msgid "invalid response from agent\n"
+msgstr "����������Ӧ��Ч\n"
+
+#: g10/passphrase.c:781 g10/passphrase.c:874
+msgid "cancelled by user\n"
+msgstr "�û�ȡ��\n"
+
+#: g10/passphrase.c:786 g10/passphrase.c:963
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "������������⣺�������򷵻� 0x%lx\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "��������ģʽ���޷�ѯ������\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "���������룺"
+
+#: g10/passphrase.c:1131
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"����Ҫ����ʹ���ߵ����룬���ܽ⿪˽Կ��\n"
+"\""
+
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s"
+
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr "(��Կ�׺� %08lX)"
+
+#: g10/passphrase.c:1213
+msgid "Repeat passphrase: "
+msgstr "��������һ�����룺"
+
+#: g10/plaintext.c:90
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "����δ�����棻���á�--output��ѡ������������\n"
+
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "������%s��ʱ��������%s\n"
+
+#: g10/plaintext.c:438
+msgid "Detached signature.\n"
+msgstr "�����ǩ�֡�\n"
+
+#: g10/plaintext.c:442
+msgid "Please enter name of data file: "
+msgstr "�����������ļ������ƣ� "
+
+#: g10/plaintext.c:463
+msgid "reading stdin ...\n"
+msgstr "���ڴӱ�׼�����ȡ ...\n"
+
+#: g10/plaintext.c:497
+msgid "no signed data\n"
+msgstr "����ǩ�ֵ�����\n"
+
+#: g10/plaintext.c:505
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "�޷�����ǩ�ֵ����ݡ�%s��\n"
+
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "�����ռ��ߣ����ڳ���ʹ��˽Կ %08lX  ...\n"
+
+#: g10/pubkey-enc.c:119
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "�ܺã����Ǿ��������ռ��ߡ�\n"
+
+#: g10/pubkey-enc.c:207
+msgid "old encoding of the DEK is not supported\n"
+msgstr "��֧�־�ʽ�� DEK ����\n"
+
+#: g10/pubkey-enc.c:228
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "�ԳƼ����㷨 %d%s δ֪����ͣ��\n"
+
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "ע�⣺��ѡ�����Ҳ��������㷨 %d\n"
+
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "ע�⣺˽Կ %08lX ���� %s ����\n"
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "ע�⣺��Կ�ѱ�����"
+
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr "˽Կ���ֲ�����\n"
+
+#: g10/seckey-cert.c:60
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "�����㷨 %d%s δ��֧��\n"
+
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "�����㷨 %d%s δ��֧��\n"
+
+#: g10/seckey-cert.c:250
+msgid "Invalid passphrase; please try again"
+msgstr "��Ч�����룻������һ��"
+
+#: g10/seckey-cert.c:251
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:311
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "���棺��⵽����Կ������������롣\n"
+
+#: g10/seckey-cert.c:349
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr "���ڲ���˽Կ����ʹ�õľ�ʽ 16 �ֽ�У���\n"
+
+#: g10/sig-check.c:75
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "���棺ǩ��ɢ��ֵ�뱨�IJ�һ��\n"
+
+#: g10/sig-check.c:99
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "���棺ǩ����Կ %08lX δ��������֤\n"
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "���棺ǩ����Կ %08lX ������֤��Ч\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "��Կ %08lX ����ǩ��ǰ %lu ������\n"
+
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "��Կ %08lX ����ǩ��ǰ %lu ������\n"
+
+#: g10/sig-check.c:180
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
+
+#: g10/sig-check.c:182
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
+
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "ע�⣺ǩ����Կ %08lX ���� %s ����\n"
+
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "�ٶ���Կ %08lX ��ǩ������ij��δ֪�Ĺؼ��ֽڳ�����������\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "��Կ %08lX��û����Կ�������������Կ\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "��Կ %08lX��û������Կ��ǩ�ֶ�Ӧ����Կ\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "�޷��� v3 (PGP 2.x��ʽ)��ǩ���ڷ���������\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "�޷��� v3 (PGP 2.x��ʽ)����Կǩ���ڷ���������\n"
+
+#: g10/sign.c:112
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr "���棺��� %% �޷���չ(̫����)������ʹ��δ��չ�ġ�\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "�޷��� v3 (PGP 2.x��ʽ)��ǩ���ڷ������ URL\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "�޷��� v3 (PGP 2.x��ʽ)����Կǩ���ڷ������ URL\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr "���棺���� URL �� %% �޷���չ(̫����)������ʹ��δ��չ�ġ�\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr "���棺���� URL �� %% �޷���չ(̫����)������ʹ��δ��չ�ġ�\n"
+
+#: g10/sign.c:364
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "����ѽ�����ǩ��ʱ�������� %s\n"
+
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%sǩ�����ԣ���%s��\n"
+
+#: g10/sign.c:550
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "���棺��%s����һ�����ļ�\n"
+
+#: g10/sign.c:741
+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:765 g10/sign.c:1001
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "�޷����� %s��%s\n"
+
+#: g10/sign.c:794
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "ǿ��ʹ�õ� %s (%d)ɢ���㷨�����ռ��ߵ���ѡ����\n"
+
+#: g10/sign.c:886
+msgid "signing:"
+msgstr "����ǩ�֣�"
+
+#: g10/sign.c:985
+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:1138
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s ���ܽ�������\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "�޷��������� %d �ַ����ı���\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "�����г��ȳ��� %d �ַ�\n"
+
+#: g10/tdbio.c:128 g10/tdbio.c:1434
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "���ζ����ݿ��¼ %lu����������ʧ�ܣ�%s\n"
+
+#: g10/tdbio.c:134 g10/tdbio.c:1441
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "���ζ����ݿ��¼ %lu��д��ʧ�� (n=%d): %s\n"
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr "���ζ����ݿ⴦��������\n"
+
+#: g10/tdbio.c:497
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s���޷���ȡ��%s\n"
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s��Ŀ¼�����ڣ�\n"
+
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s���޷�����\n"
+
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s���޷�����\n"
+
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s���޷�������%s\n"
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s�������汾��¼ʧ�ܣ�%s"
+
+#: g10/tdbio.c:549
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s����������Ч�����ζ����ݿ�\n"
+
+#: g10/tdbio.c:552
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s�����������ζ����ݿ�\n"
+
+#: g10/tdbio.c:592
+msgid "NOTE: trustdb not writable\n"
+msgstr "ע�⣺���ζ����ݿⲻ��д��\n"
+
+#: g10/tdbio.c:608
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s����Ч�����ζ����ݿ�\n"
+
+#: g10/tdbio.c:640
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s������ɢ�б�ʧ�ܣ�%s\n"
+
+#: g10/tdbio.c:648
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s�����°汾��¼ʱ������ %s\n"
+
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s����ȡ�汾��¼ʱ������ %s\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s��д��汾��¼ʱ������%s\n"
+
+#: g10/tdbio.c:1163
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "���ζ����ݿ⣺��������ʧ�ܣ�%s\n"
+
+#: g10/tdbio.c:1171
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "���ζ����ݿ⣺��ȡʧ��(n=%d)��%s\n"
+
+#: g10/tdbio.c:1192
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s������һ�����ζ����ݿ��ļ�\n"
+
+#: g10/tdbio.c:1210
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s����¼���Ϊ%lu�İ汾��¼\n"
+
+#: g10/tdbio.c:1215
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s����Ч���ļ��汾%d\n"
+
+#: g10/tdbio.c:1400
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s����ȡ���ɼ�¼ʱ������%s\n"
+
+#: g10/tdbio.c:1408
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s��д��Ŀ¼��¼ʱ������%s\n"
+
+#: g10/tdbio.c:1418
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s����¼����ʱʧ�ܣ�%s\n"
+
+#: g10/tdbio.c:1448
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s�����Ӽ�¼ʱʧ�ܣ�%s\n"
+
+#: g10/tdbio.c:1493
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "���ζ����ݿ����𻵣���ִ�С�gpg --fix-trustdb����\n"
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "��%s������һ����Ч�ij�ʽԿ�׺�\n"
+
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "��Կ %08lX�������Σ��ѽ���\n"
+
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "��Կ %08lX �����ζ����ݿ����ظ�����\n"
+
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "��Կ %08lX�������ε���Կû�й�Կ����������\n"
+
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "��Կ�ѱ���dzɾ������Ρ�\n"
+
+#: g10/trustdb.c:344
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "���μ�¼ %lu��������� %d����ȡʧ�ܣ�%s\n"
+
+#: g10/trustdb.c:350
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "���μ�¼ %lu ���������������� %d\n"
+
+#: g10/trustdb.c:365 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "���μ�¼ %lu����� %d��д��ʧ�ܣ�%s\n"
+
+#: g10/trustdb.c:380 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "���ζ����ݿ⣺ͬ��ʧ�ܣ�%s\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "��������"
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
+msgid "no need for a trustdb check\n"
+msgstr "����Ҫ������ζ����ݿ�\n"
+
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "�´����ζ����ݿ��齫�� %s ����\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "����Ҫ������ζ����ݿ�\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "����Ҫ������ζ����ݿ�\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "��Կ %08lX δ���ҵ���%s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "��ִ��һ�� --check-trustdb\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "���ڼ�����ζ����ݿ�\n"
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "�Ѿ������� %d ����Կ(�����ѽ���� %d �ݵ���Ч��)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "û���ҵ��κξ������ε���Կ\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "�������ε���Կ %08lX �Ĺ�Կδ���ҵ�\n"
+
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "���μ�¼ %lu����� %d��д��ʧ�ܣ�%s\n"
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"ǩ���޷�����֤��\n"
+"���סǩ���ļ�(.sig��.asc)\n"
+"Ӧ�������������и����ĵ�һ���ļ���\n"
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "������ %u ̫��������ĩ�Ļ��з� LF ��ʧ\n"
+
+#: 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"
+
+#: g10/skclist.c:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "��%s�����������ظ�\n"
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "��%s����������%s\n"
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr "��������˽Կ�Ѵ���\n"
+
+#: g10/skclist.c:179
+#, fuzzy, c-format
+msgid ""
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
+"signatures!\n"
+msgstr "��%s��������������һ���� PGP ���ɵ� ElGamal ��Կ������ǩ�ֲ���ȫ��\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "�ļ���%s���Ѵ��ڡ� "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "�Ƿ񸲸�(y/N)��"
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s��δ֪�ĺ�׺��\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "�������µ��ļ���"
+
+#: g10/openfile.c:183
+msgid "writing to stdout\n"
+msgstr "����д�뵽��׼���\n"
+
+#: g10/openfile.c:282
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "�ٶ���ǩ�ֵ������ڡ�%s��\n"
+
+#: g10/openfile.c:349
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "�µ������ļ���%s���ѽ���\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "���棺�ڡ�%s�����ѡ���ڴ˴������ڼ�δ��ʹ��\n"
+
+#: g10/openfile.c:380
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s���޷�����Ŀ¼��%s\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s���Ѵ���Ŀ¼\n"
+
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "���棺���ı�ʹ�öԳƼ����㷨������Կ���ܡ�\n"
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr "�������ܰ�������\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "����������Կ������������\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "�ԳƼ����޷�������������Կ���Ѿ����� %d �Σ�\n"
+
+#: g10/seskey.c:210
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA Ҫ��ʹ�� 160 �ֽڵ�ɢ���㷨\n"
+
+#: g10/delkey.c:121 g10/delkey.c:128
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(��������ָ��ָ����Կ)\n"
+
+#: g10/delkey.c:127
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "��������ģʽ�У�û�С�--yes�����޷���ô��\n"
+
+#: g10/delkey.c:139
+msgid "Delete this key from the keyring? "
+msgstr "Ҫ��Կ�׻���ɾ�������Կ��"
+
+#: g10/delkey.c:147
+msgid "This is a secret key! - really delete? "
+msgstr "����һ��˽Կ���������Ҫɾ����"
+
+#: g10/delkey.c:157
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "ɾ����Կ����ʱʧ�ܣ�%s\n"
+
+#: g10/delkey.c:167
+msgid "ownertrust information cleared\n"
+msgstr "���ζ���Ϣ�ѱ����\n"
+
+#: g10/delkey.c:195
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "��Կ��%s���ж�Ӧ��˽Կ��\n"
+
+#: g10/delkey.c:197
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "����ʹ�á�--delete-secret-keys��ѡ����ɾ������\n"
+
+#: g10/helptext.c:48
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"������ָ������ֵ��ȫ�����Լ���������Щ��ֵ��Զ���ᱻ������κε�������\n"
+"������Ҫ����ʵ�����ζ����磻�������������������֤�����޹ء�"
+
+#: g10/helptext.c:54
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"Ҫ�������������磬GnuPG ��Ҫ֪����Щ��Կ�ǿɾ������ε�\n"
+"����ͨ��������ӵ��˽Կ����Щ��Կ���ش�yes��������Щ\n"
+"��Կ��ɿɾ������ε�\n"
+
+#: g10/helptext.c:61
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr "������������Ҫʹ����ѱ������˵���Կ����ش�yes����"
+
+#: g10/helptext.c:65
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr "������������Ҫʹ�����δ�����ε���Կ����ش�yes����"
+
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "������Ҫ���͵ı��ĵĽ����ߵ��û���ʶ��"
+
+#: g10/helptext.c:73
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+
+#: g10/helptext.c:87
+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 ""
+"ͨ����˵��ͬһ����Կǩ�ּ����ܲ����Ǹ������⡣\n"
+"����㷨ֻ���ض��������ʹ�á�\n"
+"������ѯ��ȫ�����ר�ҡ�"
+
+#: g10/helptext.c:94
+msgid "Enter the size of the key"
+msgstr "��������Կ�ijߴ�"
+
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
+msgid "Answer \"yes\" or \"no\""
+msgstr "��ش�yes����no��"
+
+#: g10/helptext.c:108
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"��������ʾ��Ҫ�����ֵ��\n"
+"���������� ISO ���ڸ�ʽ(YYYY-MM-DD)�����dz���ʱ������õ��Ѻõ���Ӧ����\n"
+"ϵͳ�᳢�Խ�����ֵ����Ϊʱ������"
+
+#: g10/helptext.c:120
+msgid "Enter the name of the key holder"
+msgstr "��������Կ�����˵�����"
+
+#: g10/helptext.c:125
+msgid "please enter an optional but highly suggested email address"
+msgstr "����������ʼ���ַ(��ѡ���ǿ���Ƽ�ʹ��)"
+
+#: g10/helptext.c:129
+msgid "Please enter an optional comment"
+msgstr "������ע��(��ѡ��)"
+
+#: g10/helptext.c:134
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N  �޸�������\n"
+"C  �޸�ע�͡�\n"
+"E  �޸ĵ����ʼ���ַ��\n"
+"O  ����������Կ��\n"
+"Q  ��ֹ������Կ��"
+
+#: g10/helptext.c:143
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "���������������Կ����ش�yes��(���ߡ�y��)��"
+
+#: g10/helptext.c:151
+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"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"����Ϊij����Կ��ij���û���ʶ����ǩ��ʱ��������������֤���\n"
+"��Կȷʵ���������������û���ʶ�ϵ��Ǹ��ˡ��˽⵽������ô��\n"
+"���ضԴ˽��й���֤�����������Ƿdz����õ�\n"
+"\n"
+"��0�� ��ʾ����������κ��ض�������������\n"
+"    ������ϸ��֤�ǰ���Կ\n"
+"\n"
+"��1�� ��ʾ�����������Կ�����Ǹ����������˵��ˣ�\n"
+"    ���������ܻ����û����֤����\n"
+"    �����Щֻ��Ҫ�����ˡ���֤������˵�����ã�\n"
+"    ��Ϊ��Ϊһ����������ʹ���ߵ���Կǩ���֡�\n"
+"\n"
+"��2�� ��ʾ���������֤���ǰ���Կ��\n"
+"    ���磬����֤�������Կ��ָ�ƣ�\n"
+"    ��ȶ���Ƭ��֤���û���ʶ��\n"
+"\n"
+"��3�� ��ʾ�����˴����꾡����֤��Կ������\n"
+"    ����˵����ͬ��Կ��������֤����Կָ�ƣ�\n"
+"    ����ͨ�����鸽����Ƭ������α���֤��(�绤��)\n"
+"    ȷ������Կ�����˵���������Կ�ϵ��û���ʶһ�£�\n"
+"    �������(ͨ�������ʼ�����)��֤����Կ�ϵ�\n"
+"    �����ʼ���ַȷʵ������Կ�����ˡ�\n"
+"\n"
+"��ע���������ڵȼ� 2 �� 3 ��˵���������Ӷ��ѡ�\n"
+"���ջ��ǵ������Լ���������Ϊ������Կǩ��ʱ��\n"
+"ʲô�ǡ����⡱����ʲô�ǡ��������꾡����\n"
+"\n"
+"�������֪��Ӧ��ѡʲô�𰸵Ļ�����ѡ��0����"
+
+#: g10/helptext.c:189
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "�������ҪΪ�����û���ʶǩ�ֵĻ���ѡ��yes��"
+
+#: g10/helptext.c:193
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"����������Ҫɾ������û���ʶ�Ļ��ͻش�yes����\n"
+"���������֤�ڴ�֮��Ҳ�ᶪʧ��"
+
+#: g10/helptext.c:198
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "�������ɾ�������Կ����ش�yes��"
+
+#: g10/helptext.c:203
+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 ""
+"����һ���������Կ����Ч��ǩ�֣�ͨ����������Ҫɾ�����ǩ�֣�\n"
+"��ΪҪ�������Կ��ӵ�������Կ��ǩ�ֵ���Կ������֤��ϵ����\n"
+"�൱��Ҫ��"
+
+#: g10/helptext.c:208
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"���ǩ���޷������飬��Ϊ��û����Ӧ����Կ����Ӧ���ݻ�ɾ������\n"
+"ֱ����֪����ǩ��ʹ������һ����Կ����Ϊ����ǩ�ֵ���Կ������\n"
+"�����Ѿ���֤����Կ������֤��ϵ��"
+
+#: g10/helptext.c:214
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr "���ǩ����Ч��Ӧ������������Կ�׻���ɾ����"
+
+#: g10/helptext.c:218
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"����һ�ݽ���Կ���û���ʶ����ϵ��ǩ�֡�ͨ����Ӧ\n"
+"ɾ��������ǩ�֡���ʵ�ϣ�һ��ɾ����GnuPG\n"
+"���ܴӴ˾Ͳ�����ʹ�������Կ�ˡ���ˣ�ֻ������\n"
+"����Կ�ĵ�һ������ǩ����ijЩԭ��ʧЧ�����еڶ�\n"
+"������ǩ�ֿ��õ�����²���ô����"
+
+#: g10/helptext.c:226
+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 ""
+"�����е���ѡ���������(��ѡȡ��)�û���ʶ����ѡ�\n"
+"������Ӱ�������ǩ�ֵ�ʱ�����������һ���ӡ�\n"
+
+#: g10/helptext.c:233
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr "���������룺����һ�����ܵľ��� \n"
+
+#: g10/helptext.c:239
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "���ٴ������������룬��ȷ�������׼�����Щʲô��"
+
+#: g10/helptext.c:243
+msgid "Give the name of the file to which the signature applies"
+msgstr "�����Ҫ����ǩ�ֵ��ļ���"
+
+#: g10/helptext.c:248
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "������Ը�������ļ�����ش�yes��"
+
+#: g10/helptext.c:253
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"������һ���µ��ļ����������ֱ�Ӱ����˻س�����ô\n"
+"�ͻ�ʹ����ʾ�������е�Ĭ�ϵ��ļ�����"
+
+#: g10/helptext.c:259
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"��Ӧ��Ϊ��ݵ���֤��ָ��һ��ԭ��\n"
+"�����龳�IJ�ͬ����Ӧ�ÿ��Դ�����嵥��ѡ��һ�\n"
+"  ����Կ��й©��\n"
+"      �����������ij��δ�����ɵ�����ȡ��������˽Կ��\n"
+"      ��ѡ���\n"
+"  ����Կ���滻��\n"
+"      ���������һ������Կ����ɵģ���ѡ���\n"
+"  ����Կ���ٱ�ʹ�á�\n"
+"      ������Ѿ����������Կ���ݣ���ѡ����\n"
+"  ���û���ʶ������Ч��\n"
+"      �������û���ʶ���ٱ�ʹ���ˣ���ѡ���\n"
+"      ��ͨ���ñ���ij�������ʼ���ַ�Ѳ�����Ч��\n"
+
+#: g10/helptext.c:275
+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 ""
+"��Ҳ��������һ�����֣�����������ݵ���֤������ɡ�\n"
+"�뾡��ʹ������ּ�����Ҫ��\n"
+"����һ�����Խ������롣\n"
+
+#: g10/helptext.c:290
+msgid "No help available"
+msgstr "û�п��õİ���"
+
+#: g10/helptext.c:298
+#, c-format
+msgid "No help available for `%s'"
+msgstr "��%s��û�п��õİ���"
+
+#: g10/keydb.c:189
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "����Կ�׻���%s��ʱ��������%s\n"
+
+#: g10/keydb.c:196
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "Կ�׻���%s���ѽ���\n"
+
+#: g10/keydb.c:615
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "���½���Կ�׻�����ʧ�ܣ� %s\n"
+
+#: g10/keyring.c:1236
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "���棺�����ļ������л���ì�ܵ���Ϣ��\n"
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s ��û�иı����һ��\n"
+
+#: g10/keyring.c:1239
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s ���µ���һ��\n"
+
+#: g10/keyring.c:1240
+msgid "Please fix this possible security flaw\n"
+msgstr "���޲�������ܵİ�ȫ��©��\n"
+
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "���ڼ��Կ�׻���%s��\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s��Կ�׻��ѽ���\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"����ѡһ��ͼƬ��Ϊ������Ƭ��ʶ ������ͼƬһ��Ҫ��JPEG�ļ���\n"
+"���ס����ͼƬ�ᱻ��������Ĺ�Կ���������˷dz����ͼƬ�Ļ���\n"
+"������ԿҲ���ɷdz���\n"
+"�뾡����ͼƬ�ߴ������240x288���ң����Ǹ�����ijߴ硣\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "����Ҫ������Ƭ��ʶ��JPEG�ļ����� "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "�޷�����Ƭ��%s����%s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "��ȷ��Ҫ������(y/N)"
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "��%s������һ�� JPEG �ļ�\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "������Ƭ��ȷ��(y/N/q)"
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "�޷���ʾ��Ƭ��ʶ��\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "��֧��Զ�̵���\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "�޷�����Ŀ¼��%s����%s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr "���������ļ�Ȩ�޲���ȫ���ⲿ������ñ�����\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr "���������ƽ̨�ϵ����ⲿ����ʱ��Ҫ��ʱ�ļ�\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "�޷�ִ��%s��%s����%s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "�����ⲿ����ʱ����ϵͳ����%s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "�ⲿ�����쳣�˳�\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "�޷�ִ���ⲿ����\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "�޷���ȡ�ⲿ������Ӧ��%s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "���棺�޷�ɾ����ʱ�ļ�(%s)��%s����%s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "���棺�޷�ɾ����ʱĿ¼��%s����%s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "��������"
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet ʧ�ܣ�%s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "��Կ %08lX��û���û���ʶ\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "���������������ߣ�\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(����һ�����еĵ�����Կ)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "ҪΪ�����Կ����һ�ݵ���֤���� "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "��ǿ��ʹ�� ASCII ��װ���������\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet ʧ�ܣ� %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "�ѽ�������֤�顣\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "û���ҵ���%s���õĵ�����Կ\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "�Ҳ�����%s��˽Կ��%s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "û�����Ӧ�Ĺ�Կ��%s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "��Կ��˽Կ���Ǻϣ�\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "δ֪�ı����㷨\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "ע�⣺�����Կû�б�������\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"�ѽ�������֤�顣\n"
+"\n"
+"�������ļ�ת�Ƶ�һ�������������Ľ���(������)�ϣ�\n"
+"��������ܹ�ȡ�����֤��Ļ�����ô��������������\n"
+"Կ�޷�����ʹ�á������ƾ֤��ӡ�����ٲص���ȫ�ĵ�\n"
+"��Ҳ�Ǻܺõķ������������ı���ý����ٶ��޷���ȡ��\n"
+"����ǧ��С�ģ����Ļ����ϵĴ�ӡϵͳ���ܻ��ڴ�ӡ��\n"
+"���а���Щ������ʱ��ij��������Ҳ�ܹ����õ��ĵط���\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "��ѡ�������ԭ��\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "ȡ��"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Ҳ��������Ҫ������ѡ��%d)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "����������(��ѡ)���Կհ��н�����\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "����ԭ��%s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(����������)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "���������� "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# ��ָ�������ζȵ��嵥�������� %s \n"
+"# (���á�gpg --import-ownertrust��������Щ���ζ�)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "�޷����ļ���%s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "��̫��\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "����ð��ȱ©\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "������Ч��ָ��\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "����û�����ζ�\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "Ѱ�����ζȼ�¼ʱ������%s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "��ȡ����%s\n"
+
+#~ msgid ""
+#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+#~ msgstr "���棺ɢ���㷨��%s�������� OpenPGP ��һ���֡���Ҫʹ�ã�����Ը���\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[�ļ���]|�����ļ�"
+
+#~ msgid "store only"
+#~ msgstr "������"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[�ļ���]|�����ļ�"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "Ϊij����Կ���Ӳ��ɵ�����ǩ��"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "Ϊij����Կ���Ӳ��ɵ����ı���ǩ��"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "���������"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "�������ζ�"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "�������ζ�"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "���ܸ�Ԥ�ظ������ζ����ݿ�"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "�޸�ij�����𻵵����ζ����ݿ�"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "Ϊ�ļ����׼����⿪ ASCII ��װ"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "Ϊ�ļ����׼������� ASCII ��װ"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|ij��|����ij�ס�ѡΪĬ�ϵ��ռ���"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "��Ĭ�ϵ���Կ����Ĭ�ϵ��ռ���"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "��ȫ��Ҫʹ���ն�"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "ǿ��ʹ�� v3 ǩ��"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "��Ҫǿ��ʹ�� v3 ǩ��"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "ǿ��ʹ�� v4 ��Կǩ��"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "��Ҫǿ��ʹ�� v4 ��Կǩ��"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "����ʱ��ʹ�ñ䶯�����"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "����ʱ��Զ��ʹ�ñ䶯�����"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "ʹ�� gpg-agent ��������"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "������ģʽ����Զ��ѯ��"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "�ٶ����������Ļش�Ϊ���ǡ�"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "�ٶ����������Ļش�Ϊ����"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "�����Կ�׻��ӽ�Կ�׻��嵥��"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "�����˽ԿԿ�׻��ӽ��嵥��"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "��ʾ���г�����Կ����һ��Կ�׻���"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|ij��|����ij�ס���ΪĬ��˽Կ"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|������|ʹ�������Կ��������Ѱ����Կ"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|�ַ�����|�趨�ն�ʹ�õ��ַ���"
+
+#~ msgid "read options from file"
+#~ msgstr "���ļ���ȡѡ��"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[�ļ���]|��״̬��Ϣд���ļ�"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|Կ�׺�|�������δ���Կ"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|�ļ���|������չģ��"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "���� RFC1991 ����������ģʽ"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "�������ܺ�ɢ���㷨��ѡ�����Ϊ OpenPGP ��ʽ"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr "�������ܺ�ɢ���㷨��ѡ�����Ϊ PGP 2.x ��ʽ"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|ʹ��ģʽ N ������"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|�㷨��|ָ������ʹ�õı���ɢ���㷨"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|�㷨��|ָ������ʹ�õĶԳƼ����㷨"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|�㷨��|ָ��ʹ�õĶԳƼ����㷨"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|�㷨��|ָ��ʹ�õı���ɢ���㷨"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|ʹ�õ� N ��ѹ���㷨"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "�����ռ���Կ�׺ż�����ܰ���"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "��ʾ��Ƭ��ʶ"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "����ʾ��Ƭ��ʶ"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "�趨�鿴��Ƭ��ʶʱʹ�õ�������"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "��%s��ѹ���㷨�ڱ����а汾��ֻ��\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "ѹ���㷨һ��Ҫ���� %d �� %d ֮��\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: �޷�ȷ�������Կ�Ƿ���������������Ƶij�����\n"
+#~ "������Կ�Ծɱ�������\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "��ѡ�� %c%lu ��Ч\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "��Կ %08lX������һ�� rfc2440 ��Կ����������\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr "ע�⣺��⵽ Elgamal ��Կ�������������Կ���ܻ�����һ��ʱ��\n"
+
+#~ msgid " (default)"
+#~ msgstr " (Ĭ��)"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX �����ڣ�%s ��Ч����%s"
+
+#~ msgid "Notation: "
+#~ msgstr "��ǣ�"
+
+#~ msgid "Policy: "
+#~ msgstr "���ԣ�"
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "���ڲ�ѯ��Կ %08lX������ %s\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "�޷��ӹ�Կ������ȡ����Կ�� %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "�ϴ�����%s����ʱ��������%s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "�ɹ��ϴ�����%s��(״̬ = %u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "�ϴ�����%s��ʧ�ܣ�״̬ = %u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "�˹�Կ��������֧�� --search-keys\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "������Ѱ��%s������ HKP ������ %s ��\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "�޷���Ѱ��Կ��������%s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr "��Կ %08lX�������� PGP ������ ElGamal ��Կ������ǩ�ֲ���ȫ��\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr "��Կ %08lX ���� %lu ����δ�����ɵ�(ʱ��Ť����ʱ�ӵ�����)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr "��Կ %08lX ���� %lu ����δ�����ɵ�(ʱ��Ť����ʱ�ӵ�����)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "��Կ %08lX �����Ϊ��������\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "�� Elgamal ǩ����Կ %08lX Ϊ %08lX ����ǩ�ֱ�����\n"
+
+# FIXME: I added the format string at the end to avoid a format string vulnerability.  This should be fixed properly of course - wk
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "�� %08lX Ϊ Elgamal ǩ����Կ����ǩ�ֱ����� (%08lX)\n"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "ѡ��Ҫʹ�õ��㷨��\n"
+#~ "\n"
+#~ "DSA (�༴DSS)��һ��ֻ������ǩ�ֵ�����ǩ���㷨����Ҳ���Ƽ�ʹ�õ��㷨��\n"
+#~ "��Ϊ��֤ DSA ǩ��Զ�� ElGamal ǩ�ֿ졣\n"
+#~ "\n"
+#~ "ElGamal ��һ�ּȿ�����ǩ�ֺ�Ҳ�����ڼ��ܵ��㷨��\n"
+#~ "OpenPGP �������㷨���ֳ�������ʽ��ֻ�����ڼ��ܵģ�����ǩ�ּ����ܵģ�\n"
+#~ "��������ԭ��һ�£���Ϊ���ɰ�ȫ������ǩ�ֵ���Կ�����������ض��ķ���\n"
+#~ "ѡ��һЩ������������ʵ���˴˹��ܣ�������ʵ�� OpenPGP �ij�����ܲ���\n"
+#~ "ʶ�����ּ��ǩ�ּ����ܹ��ܵ���ʽ��\n"
+#~ "\n"
+#~ "��һ����Կ(����Կ)����Ҫ�߱�ǩ�ֵ����������\n"
+#~ "ֻ�����ڼ��ܵ� ElGamal ��Կ������˵����޷�ʹ�á�"
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "��Ȼ�� RFC2440 �ж�������Щ��Կ���������Ƽ��������ǣ�\n"
+#~ "��Ϊ���Dz��������еij�����֧�֣����������������ɵ�ǩ��\n"
+#~ "ʮ���Ӵ���֤�������ǻ�����"
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "��Կ������\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "��Կ %08lX ������\n"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (����ǩ�ּ�����)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "��ע�⣬ֻ�� GnuPG ��֧������㷨��������㷨���ɵ���Կ\n"
+#~ "�޷��� PGP ʹ���߻�ͨ��ͬʱ����㷨�dz�������\n"
+#~ "���ҿ���Ҳ���������㷨��ȫ��\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "������λ���Ҫ������ "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "��⵽��Ч�ĶԳƼ����㷨 (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "�����Կ������������ȫ�� HKP ����\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
new file mode 100644
index 000000000..0dcadacdb
--- /dev/null
+++ b/po/zh_TW.po
@@ -0,0 +1,5588 @@
+# Traditional Chinese(zh-tw) messages for GnuPG
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Jedi <[email protected]>, 2003.
+# 
+# Special thanks to "Autrijus Tang <[email protected]>".
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.2.2\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-05-13 15:48+0800\n"
+"Last-Translator: Jedi <[email protected]>\n"
+"Language-Team: Chinese (traditional) <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=BIG5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: util/secmem.c:90
+msgid "WARNING: using insecure memory!\n"
+msgstr "ĵ�i�G���b�ϥΤ��w�����O����I\n"
+
+#: util/secmem.c:91
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr "�аѦ� http://www.gnupg.org/faq.html �W�i�@�B����T\n"
+
+#: util/secmem.c:340
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "�|���ҥΦw�����O����e�A���i��i��ާ@\n"
+
+#: util/secmem.c:341
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(�]�\�p����{���Ӱ��o��ƤF)\n"
+
+#: util/miscutil.c:307 util/miscutil.c:344
+#, fuzzy
+msgid "yes"
+msgstr "yes"
+
+#: util/miscutil.c:308 util/miscutil.c:349
+msgid "yY"
+msgstr "yY"
+
+#: util/miscutil.c:310 util/miscutil.c:346
+msgid "no"
+msgstr "no"
+
+#: util/miscutil.c:311 util/miscutil.c:350
+msgid "nN"
+msgstr "nN"
+
+#: util/miscutil.c:348 g10/keyedit.c:1138
+msgid "quit"
+msgstr "quit"
+
+#: util/miscutil.c:351
+msgid "qQ"
+msgstr "qQ"
+
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "�@��ʿ��~"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "�������ʥ]���A"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "����������"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "���������_�t��k"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "�������K�n�t��k"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "�l�a�����_"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "�l�a���p�_"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "�l�a��ñ��"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "�[�`�ˬd���~"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "���~���K�X��"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "�䤣�줽�_"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "�������s�K�t��k"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "�S��k�}���_�Ͱ�"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "�L�Ī��ʥ]"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "�L�Ī��ʸ�"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "�S���o�ӨϥΪ� ID"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "�L�k���Ψp�_"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "�ΤF���~���p�_"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "���Q�䴩"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "�l�a�����_"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "�ɮ�Ū�����~"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "�ɮ׼g�J���~"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "���������Y�t��k"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "�ɮ׶}�ҿ��~"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "�ɮ׫إ߿��~"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "�L�Ī��K�X��"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "���Q�ĥΪ����_�t��k"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "���Q�ĥΪ��s�K�t��k"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "�������h��"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "�H����Ʈw���~"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "�l�a�� MPI"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "�귽����"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "�L�Ī��_�Ͱ�"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "�l�a������"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "�Q�ܳy�L���ϥΪ� ID"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "�ɮ��������~"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "�ɮק�W���~"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "�ɮקR�����~"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "���w�������"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "�ɶ��W�L���٬�"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "�L�k�ϥΪ����_�t��k"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "�ɮפw�s�b"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "���_���z"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "�L�Ī��Ѽ�"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "�l�a�� URI"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "���Q�䴩�� URI"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "�������~"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "���Q�[�K"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "���Q�B�z"
+
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "���i�����_"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "���i���p�_"
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr "���_���A�����~"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... �o�O�ӷ岫 (%s:%d:%s)\n"
+
+#: util/logger.c:285
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "�p���@�ӷ岫�F ... (%s:%d)\n"
+
+#: cipher/random.c:163
+msgid "no entropy gathering module detected\n"
+msgstr "��������üƻ`���Ҳ�\n"
+
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "�L�k�}�� `%s' �G %s\n"
+
+#: cipher/random.c:391
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "�L�k���o�ɮ� `%s' ����T�G %s\n"
+
+#: cipher/random.c:396
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "`%s' ���O�@�ӼзǪ��ɮ� �w �w���L\n"
+
+#: cipher/random.c:401
+msgid "note: random_seed file is empty\n"
+msgstr "�Ъ`�N�G random_seed �ɮ׬O�Ū�\n"
+
+#: cipher/random.c:407
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "ĵ�i�G random_seed �ɮפj�p�L�� �w �����ĥ�\n"
+
+#: cipher/random.c:415
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "�L�kŪ�� `%s' �G %s\n"
+
+#: cipher/random.c:453
+msgid "note: random_seed file not updated\n"
+msgstr "�Ъ`�N�G random_seed �ɮץ��Q��s\n"
+
+#: cipher/random.c:473 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "�L�k�إ� `%s' �G %s\n"
+
+#: cipher/random.c:480
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "�L�k�g�J `%s' �G %s\n"
+
+#: cipher/random.c:483
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "�L�k���� `%s' �G %s\n"
+
+#: cipher/random.c:728
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "ĵ�i�G���b�ϥΤ��w�����H���Ʀr���;��I�I\n"
+
+#: cipher/random.c:729
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"�o���H���Ʀr���;��ڥ��N�O�C���K��X�Ӫ����F��w�w\n"
+"���ڥ��N���O�j�Ӧ��O���üƲ��;��I\n"
+"\n"
+"*** ���藍�n��o�ӵ{�����ͪ������Ʈ��ӥΡI�I ***\n"
+"\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"�H���줸�դ����h�C�Цh���@�Ǧ����S���Ʊ��A\n"
+"�o�˧@�~�t���ׯ�`�����h���üơI(�ٻݭn %d �줸��)\n"
+
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"�еy�ݤ���A�t�Φ��ɥ��b�`���üơC�p�G�p�|ı�o�L�᪺�ܡA\n"
+"�������ǧO���ơA�o�ˤl�Ʀܯ�����üƪ��~���n�C\n"
+
+#: cipher/primegen.c:120
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr ""
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:354
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@���O�G\n"
+" "
+
+#: g10/g10.c:356
+msgid "|[file]|make a signature"
+msgstr "|[�ɮ�]|�إߤ@��ñ��"
+
+#: g10/g10.c:357
+msgid "|[file]|make a clear text signature"
+msgstr "|[�ɮ�]|�إߤ@������ñ��"
+
+#: g10/g10.c:358
+msgid "make a detached signature"
+msgstr "�إߤ@��������ñ��"
+
+#: g10/g10.c:359
+msgid "encrypt data"
+msgstr "�[�K���"
+
+#: g10/g10.c:361
+msgid "encryption only with symmetric cipher"
+msgstr "�Ȩϥι�٦��s�K�k�ӥ[�K"
+
+#: g10/g10.c:363
+msgid "decrypt data (default)"
+msgstr "��ƸѱK(�w�])"
+
+#: g10/g10.c:365
+msgid "verify a signature"
+msgstr "���ҬY��ñ��"
+
+#: g10/g10.c:367
+msgid "list keys"
+msgstr "�C�X���_"
+
+#: g10/g10.c:369
+msgid "list keys and signatures"
+msgstr "�C�X���_�Mñ��"
+
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "�ˬd���_ñ��"
+
+#: g10/g10.c:371
+msgid "list keys and fingerprints"
+msgstr "�C�X���_�M����"
+
+#: g10/g10.c:372
+msgid "list secret keys"
+msgstr "�C�X�p�_"
+
+#: g10/g10.c:373
+msgid "generate a new key pair"
+msgstr "���ͤ@���s�����_��"
+
+#: g10/g10.c:374
+msgid "remove keys from the public keyring"
+msgstr "�q���_�_�Ͱ�̲��h���_"
+
+#: g10/g10.c:376
+msgid "remove keys from the secret keyring"
+msgstr "�q�p�_�_�Ͱ�̲��h���_"
+
+#: g10/g10.c:377
+msgid "sign a key"
+msgstr "ñ�p�Y����_"
+
+#: g10/g10.c:378
+msgid "sign a key locally"
+msgstr "�Ȧb���añ�p�Y����_"
+
+#: g10/g10.c:381
+msgid "sign or edit a key"
+msgstr "ñ�p�νs��Y����_"
+
+#: g10/g10.c:382
+msgid "generate a revocation certificate"
+msgstr "���ͤ@���M�P����"
+
+#: g10/g10.c:384
+msgid "export keys"
+msgstr "�ץX���_"
+
+#: g10/g10.c:385
+msgid "export keys to a key server"
+msgstr "����_�ץX�ܬY�Ӫ��_���A���W"
+
+#: g10/g10.c:386
+msgid "import keys from a key server"
+msgstr "�q�Y�Ӫ��_���A���W�פJ���_"
+
+#: g10/g10.c:388
+msgid "search for keys on a key server"
+msgstr "�b�Y�Ӫ��_���A���W�j�M���_"
+
+#: g10/g10.c:390
+msgid "update all keys from a keyserver"
+msgstr "�q�Y�Ӫ��_���A���W��s�Ҧ������_"
+
+#: g10/g10.c:393
+msgid "import/merge keys"
+msgstr "�פJ/�X�֪��_"
+
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
+
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
+
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
+
+#: g10/g10.c:406
+msgid "update the trust database"
+msgstr "��s�H����Ʈw"
+
+#: g10/g10.c:413
+msgid "|algo [files]|print message digests"
+msgstr "|�t��k [�ɮ�]|�L�X�T���K�n"
+
+#: g10/g10.c:417 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"�ﶵ�G\n"
+" "
+
+#: g10/g10.c:419
+msgid "create ascii armored output"
+msgstr "�إߥH ASCII �ʸ˹L����X"
+
+#: g10/g10.c:421
+msgid "|NAME|encrypt for NAME"
+msgstr "|�W�r|�H�u�W�r�v�@���[�K��H"
+
+#: g10/g10.c:432
+msgid "use this user-id to sign or decrypt"
+msgstr "�ϥγo�ӨϥΪ� ID ��ñ�p�θѱK"
+
+#: g10/g10.c:433
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|�]�w���Y���Ŭ� N (0 ���ܤ����Y)"
+
+#: g10/g10.c:438
+msgid "use canonical text mode"
+msgstr "�ϥμзǪ���r�Ҧ�"
+
+#: g10/g10.c:448
+msgid "use as output file"
+msgstr "���@��X�ɮרӨϥ�"
+
+#: g10/g10.c:450 g10/gpgv.c:66
+msgid "verbose"
+msgstr "�o���Ҧ�"
+
+#: g10/g10.c:461
+msgid "do not make any changes"
+msgstr "���n���������"
+
+#: g10/g10.c:462
+msgid "prompt before overwriting"
+msgstr "�мg�e���߰�"
+
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
+msgstr ""
+
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
+msgstr ""
+
+#: g10/g10.c:535
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(�аѷӽu�W���������Ө��o�Ҧ��R�O�M�ﶵ������M��)\n"
+
+#: g10/g10.c:538
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"�d�ҡG\n"
+"\n"
+" -se -r Bob [�ɮ�]          �� Bob �o�ӨϥΪ�ñ�p�Υ[�K\n"
+" --clearsign [�ɮ�]         ���X����ñ��\n"
+" --detach-sign [�ɮ�]       ���X������ñ��\n"
+" --list-keys [�W�r]         ��ܪ��_\n"
+" --fingerprint [�W�r]       ��ܫ���\n"
+
+#: g10/g10.c:713 g10/gpgv.c:91
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr "�ЦV <[email protected]> �^���{���岫�C\n"
+
+#: g10/g10.c:730
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "�Ϊk�G gpg [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
+
+#: g10/g10.c:733
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"�y�k�G gpg [�ﶵ] [�ɮ�]\n"
+"ñ�p�B�ˬd�B�[�K�θѱK\n"
+"�w�]���ާ@�|�̿�J��Ʀөw\n"
+
+#: g10/g10.c:744
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"�w�Q�䴩���t��k�G\n"
+
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "���_�G "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "�s�K�k�G "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "����G "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "���Y�G "
+
+#: g10/g10.c:848
+msgid "usage: gpg [options] "
+msgstr "�Ϊk�G gpg [�ﶵ] "
+
+#: g10/g10.c:951
+msgid "conflicting commands\n"
+msgstr "���O�����٬�\n"
+
+#: g10/g10.c:969
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr "�b�u%s�v�s�թw�q�̧䤣�� = �O��\n"
+
+#: g10/g10.c:1166
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
+
+#: g10/g10.c:1169
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
+
+#: g10/g10.c:1172
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
+
+#: g10/g10.c:1178
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
+
+#: g10/g10.c:1181
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
+
+#: g10/g10.c:1334
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "�s���]�w�� `%s' �Q�إߤF\n"
+
+#: g10/g10.c:1601
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
+
+#: g10/g10.c:1637
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
+
+#: g10/g10.c:1641
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "�ﶵ�� `%s' �G %s\n"
+
+#: g10/g10.c:1648
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "�q `%s' Ū���ﶵ\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "�Ъ`�N�G�@�뱡�p�U���|�Ψ� %s�I\n"
+
+#: g10/g10.c:1887
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
+
+#: g10/g10.c:2099
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s ���O�@�Ӧ��Ī��r����\n"
+
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
+msgstr "�L�k���R���_���A�� URI\n"
+
+#: g10/g10.c:2124
+#, fuzzy, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
+
+#: g10/g10.c:2127
+#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "�L�Ī��ץX�ﶵ\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
+
+#: g10/g10.c:2137
+msgid "invalid import options\n"
+msgstr "�L�Ī��פJ�ﶵ\n"
+
+#: g10/g10.c:2144
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
+
+#: g10/g10.c:2147
+msgid "invalid export options\n"
+msgstr "�L�Ī��ץX�ﶵ\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "�L�Ī��פJ�ﶵ\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
+
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "�L�Ī��ץX�ﶵ\n"
+
+#: g10/g10.c:2208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "�L�k������ɸ��|�]�� %s\n"
+
+#: g10/g10.c:2398
+msgid "WARNING: program may create a core file!\n"
+msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
+
+#: g10/g10.c:2402
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
+
+#: g10/g10.c:2411
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s ���Q���\�� %s �֥�\n"
+
+#: g10/g10.c:2414
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
+
+#: g10/g10.c:2435
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
+
+#: g10/g10.c:2441
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "�p�b --pgp2 �Ҧ��U�ɡA����P��ñ�p�M�[�K\n"
+
+#: g10/g10.c:2447
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr "�ҥ� --pgp2 �ɩp�����Өϥ��ɮסA�ӫD�޹D\n"
+
+#: g10/g10.c:2460
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "�b --pgp2 �Ҧ��U�[�K�T���ݭn IDEA �s�K�k\n"
+
+#: g10/g10.c:2528 g10/g10.c:2552
+msgid "selected cipher algorithm is invalid\n"
+msgstr "�ҿ諸�s�K�t��k�L��\n"
+
+#: g10/g10.c:2534 g10/g10.c:2558
+msgid "selected digest algorithm is invalid\n"
+msgstr "�ҿ諸�K�n�t��k�L��\n"
+
+#: g10/g10.c:2540
+#, fuzzy
+msgid "selected compression algorithm is invalid\n"
+msgstr "�ҿ諸�s�K�t��k�L��\n"
+
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
+
+#: g10/g10.c:2561
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed �@�w�n�j�� 0\n"
+
+#: g10/g10.c:2563
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed �@�w�n�j�� 1\n"
+
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depth �@�w�n���� 1 �M 255 ����\n"
+
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
+
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
+
+#: g10/g10.c:2572
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "�Ъ`�N�G�j�P����ij�ϥγ�ª� S2K �Ҧ� (0)\n"
+
+#: g10/g10.c:2576
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "�L�Ī� S2K �Ҧ��F�@�w�n�O 0 �B 1 �� 3\n"
+
+#: g10/g10.c:2583
+msgid "invalid default preferences\n"
+msgstr "�L�Ī��w�]���n\n"
+
+#: g10/g10.c:2592
+msgid "invalid personal cipher preferences\n"
+msgstr "�L�Ī��ӤH�s�K�k���n\n"
+
+#: g10/g10.c:2596
+msgid "invalid personal digest preferences\n"
+msgstr "�L�Ī��ӤH�K�n���n\n"
+
+#: g10/g10.c:2600
+msgid "invalid personal compress preferences\n"
+msgstr "�L�Ī��ӤH���Y���n\n"
+
+#: g10/g10.c:2633
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
+
+#: g10/g10.c:2680
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:2685
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:2690
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:2778
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "�H����Ʈw�ҩl���ѡG %s\n"
+
+#: g10/g10.c:2789
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
+
+#: g10/g10.c:2800
+msgid "--store [filename]"
+msgstr "--store [�ɦW]"
+
+#: g10/g10.c:2807
+msgid "--symmetric [filename]"
+msgstr "--symmetric [�ɦW]"
+
+#: g10/g10.c:2819
+msgid "--encrypt [filename]"
+msgstr "--encrypt [�ɦW]"
+
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [�ɦW]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:2855
+msgid "--sign [filename]"
+msgstr "--sign [�ɦW]"
+
+#: g10/g10.c:2868
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [�ɦW]"
+
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [�ɦW]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:2908
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [�ɦW]"
+
+#: g10/g10.c:2917
+msgid "--clearsign [filename]"
+msgstr "--clearsign [�ɦW]"
+
+#: g10/g10.c:2942
+msgid "--decrypt [filename]"
+msgstr "--decrypt [�ɦW]"
+
+#: g10/g10.c:2950
+msgid "--sign-key user-id"
+msgstr "--sign-key �ϥΪ�ID"
+
+#: g10/g10.c:2954
+msgid "--lsign-key user-id"
+msgstr "--lsign-key �ϥΪ�ID"
+
+#: g10/g10.c:2958
+msgid "--nrsign-key user-id"
+msgstr "--nrsign-key �ϥΪ�ID"
+
+#: g10/g10.c:2962
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key �ϥΪ�ID"
+
+#: g10/g10.c:2986
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key �ϥΪ�ID [���O]"
+
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "�L�k�}�� %s: %s\n"
+
+#: g10/g10.c:3057
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
+
+#: g10/g10.c:3094
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:3096
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:3098
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:3109
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:3119
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "��s�p�_���ѡG %s\n"
+
+#: g10/g10.c:3160
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
+
+#: g10/g10.c:3168
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "�i��ʸ˥��ѡG %s\n"
+
+#: g10/g10.c:3255
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "�L�Ī� `%s' ����t��k\n"
+
+#: g10/g10.c:3378
+msgid "[filename]"
+msgstr "[�ɦW]"
+
+#: g10/g10.c:3382
+msgid "Go ahead and type your message ...\n"
+msgstr "�ж}�l��J�p���T�� ...\n"
+
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "�L�k�}�� `%s'\n"
+
+#: g10/g10.c:3659
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v�ӵ���\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
+
+#: g10/g10.c:3678
+msgid "a notation value must not use any control characters\n"
+msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
+
+#: g10/g10.c:3712
+msgid "the given certification policy URL is invalid\n"
+msgstr "���w�������ҭ�h URL �L��\n"
+
+#: g10/g10.c:3714
+msgid "the given signature policy URL is invalid\n"
+msgstr "���w����h URL �L��\n"
+
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "���w����h URL �L��\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "�ɶq�w�R��"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "�q�o���_�Ͱ�̨��Ϊ��_"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "�ȧ�ɶ��W�L�٬޵���ĵ�i"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|�ɮ״y�z|�⪬�A��T�g�J���ɮ״y�z"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "�Ϊk�G gpgv [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"�y�k�G gpg [�ﶵ] [�ɮ�]\n"
+"�Τw�������H�����_���ˬdñ��\n"
+
+#: g10/armor.c:317
+#, c-format
+msgid "armor: %s\n"
+msgstr "�ʸˡG %s\n"
+
+#: g10/armor.c:346
+msgid "invalid armor header: "
+msgstr "�L�Ī��ʸ����Y�G "
+
+#: g10/armor.c:353
+msgid "armor header: "
+msgstr "�ʸ����Y�G "
+
+#: g10/armor.c:364
+msgid "invalid clearsig header\n"
+msgstr "�L�Ī�����ñ�����Y\n"
+
+#: g10/armor.c:416
+msgid "nested clear text signatures\n"
+msgstr "�h�h����ñ��\n"
+
+#: g10/armor.c:553
+msgid "invalid dash escaped line: "
+msgstr "�L�Ī��}�鸹�h�X�C�G "
+
+#: g10/armor.c:565
+msgid "unexpected armor:"
+msgstr "���w�����ʸˡG"
+
+#: g10/armor.c:695 g10/armor.c:1276
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "�L�Ī� 64 �i��r�� %02x �Q���L�F\n"
+
+#: g10/armor.c:738
+msgid "premature eof (no CRC)\n"
+msgstr "�ɮץ��w��������(�S�� CRC ������)\n"
+
+#: g10/armor.c:772
+msgid "premature eof (in CRC)\n"
+msgstr "�ɮץ��w��������(CRC ������������)\n"
+
+#: g10/armor.c:776
+msgid "malformed CRC\n"
+msgstr "CRC �Q�ܳy�L\n"
+
+#: g10/armor.c:780 g10/armor.c:1313
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "CRC ���~�F %06lx - %06lx\n"
+
+#: g10/armor.c:800
+msgid "premature eof (in Trailer)\n"
+msgstr "�ɮץ��w�������� (�󵲧��B)\n"
+
+#: g10/armor.c:804
+msgid "error in trailer line\n"
+msgstr "�����C�����D\n"
+
+#: g10/armor.c:1091
+msgid "no valid OpenPGP data found.\n"
+msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
+
+#: g10/armor.c:1096
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "�L�Ī��ʸˡG�C���W�X %d �r��\n"
+
+#: g10/armor.c:1100
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr "�ʸ˸̥X�{�Q�޸��A�����i�C�L�r�� �w �i��O���岫���e�H�{���y����\n"
+
+#: g10/pkclist.c:61 g10/revoke.c:576
+msgid "No reason specified"
+msgstr "�����w��]"
+
+#: g10/pkclist.c:63 g10/revoke.c:578
+msgid "Key is superseded"
+msgstr "���_�Q�N���F"
+
+#: g10/pkclist.c:65 g10/revoke.c:577
+msgid "Key has been compromised"
+msgstr "���_�w�g�Q���|�F"
+
+#: g10/pkclist.c:67 g10/revoke.c:579
+msgid "Key is no longer used"
+msgstr "���_���A�Q�ϥΤF"
+
+#: g10/pkclist.c:69 g10/revoke.c:580
+msgid "User ID is no longer valid"
+msgstr "�ϥΪ� ID ���A���ĤF"
+
+#: g10/pkclist.c:73
+msgid "reason for revocation: "
+msgstr "�M�P��]�G "
+
+#: g10/pkclist.c:90
+msgid "revocation comment: "
+msgstr "�M�P�����G "
+
+#: g10/pkclist.c:195
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
+msgstr ""
+"�U�C���بS���������H���ȡG\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:207
+#, fuzzy
+msgid "          \""
+msgstr "                ��Y \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid "      aka \""
+msgstr "                ��Y \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+"�p���h�H���o��ϥΪ����Ҩ�L�ϥΪ̪����_�]�d�鶴���ҡB\n"
+"�q���P���a���ˬd������...�^����O�O�H\n"
+"\n"
+
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = �����D\n"
+
+#: g10/pkclist.c:252
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = �� *��* �H��\n"
+
+#: g10/pkclist.c:254
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = �ګj�j�H��\n"
+
+#: g10/pkclist.c:256
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = �ڧ����H��\n"
+
+#: g10/pkclist.c:258
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = �ڹ����H��\n"
+
+#: g10/pkclist.c:261
+msgid " i = please show me more information\n"
+msgstr " i = �Чi�D�ڧ�h�T��\n"
+
+#: g10/pkclist.c:264
+msgid " m = back to the main menu\n"
+msgstr " m = �^��D���\n"
+
+#: g10/pkclist.c:267
+msgid " s = skip this key\n"
+msgstr " s = ���L�o����_���B�z\n"
+
+#: g10/pkclist.c:268
+msgid " q = quit\n"
+msgstr " q = �h�X\n"
+
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
+msgid "Your decision? "
+msgstr "�p���M�w�O�ƻ�H "
+
+#: g10/pkclist.c:299
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "�p�u���n��o����_�]�������H���H"
+
+#: g10/pkclist.c:313
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "�Q�����H�����_�����ҡG\n"
+
+#: g10/pkclist.c:387
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "���_ %08lX: ���_�w�g�Q�M�P�F�I\n"
+
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
+msgid "Use this key anyway? "
+msgstr "�L�צp���٬O�ϥγo����_�ܡH "
+
+#: g10/pkclist.c:399
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "���_ %08lX: �l�_�w�g�Q�M�P�F�I\n"
+
+#: g10/pkclist.c:420
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: ���_�w�g�L���F\n"
+
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr "%08lX: �S���Ҿګ��X�o����_�u���ݩ�o�ӫ�����\n"
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: �ڭ� *��* �H���o����_\n"
+
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "%08lX: �S���Ҿګ��X�o����_�u���ݩ�o�ӫ�����\n"
+
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
+msgstr "�o����_���i���ݩ�o�ӫ�����\n"
+
+#: g10/pkclist.c:452
+msgid "This key belongs to us\n"
+msgstr "�o����_�O�ݩ�ڭ̦ۤv��\n"
+
+#: g10/pkclist.c:500
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+"�o����_�� *��* �T�w�ݩ�ϥΪ� ID �̪����ӤH�C\n"
+"���D�p **�u��** ���D�ۤv�b���ƻ�A\n"
+"�_�h�p�̦n�b�U�@�Ӱ��D�^�� no\n"
+
+#: g10/pkclist.c:514 g10/pkclist.c:544
+msgid "WARNING: Using untrusted key!\n"
+msgstr "ĵ�i�G���b�ϥΤ��Q�H�������_�I\n"
+
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G�M�P���_ %08lX ���X�{�C\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
+
+#: g10/pkclist.c:563
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
+
+#: g10/pkclist.c:564
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         �o�ܦ��i����ܳo��ñ���O�Q���y���C\n"
+
+#: g10/pkclist.c:570
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "ĵ�i�G�o��l�_�w�g�Q���������H�M�P�F�I\n"
+
+#: g10/pkclist.c:575
+msgid "Note: This key has been disabled.\n"
+msgstr "�Ъ`�N�G�o����_�w�g�Q�T�ΤF�C\n"
+
+#: g10/pkclist.c:580
+msgid "Note: This key has expired!\n"
+msgstr "�Ъ`�N�G�o����_�w�g�L���F�I\n"
+
+#: g10/pkclist.c:591
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "ĵ�i�G�o����_�ëD�H���H����ñ���һ{�ҡI\n"
+
+#: g10/pkclist.c:593
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
+msgstr "         �S���Ҿګ��X�o��ñ���ݩ�o�ӫ����̡C\n"
+
+#: g10/pkclist.c:601
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "ĵ�i�G�ڭ� *��* �H���o����_�I\n"
+
+#: g10/pkclist.c:602
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         �o��ñ���ܦ��i��O *���y��* �C\n"
+
+#: g10/pkclist.c:610
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr "ĵ�i�G�o����_�ëD�H�����H����ñ���һ{�ҡC\n"
+
+#: g10/pkclist.c:612
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         �o��ñ���ä��ݩ�o�ӫ�����\n"
+
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: �w���L�G %s\n"
+
+#: g10/pkclist.c:787 g10/pkclist.c:1011
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: �w���L�G���_�w�g�s�b�F\n"
+
+#: g10/pkclist.c:829
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr "�p�S�����w�@�ӨϥΪ� ID�C(�p�i��o�� \"-r\")\n"
+
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+"\n"
+"��J�ϥΪ� ID�C �H�ťզC�����G "
+
+#: g10/pkclist.c:887
+msgid "No such user ID.\n"
+msgstr "�S���o�ӨϥΪ� ID �C\n"
+
+#: g10/pkclist.c:892 g10/pkclist.c:954
+msgid "skipped: public key already set as default recipient\n"
+msgstr "�w���L�G���_�w�g�Q�]���w�]�����\n"
+
+#: g10/pkclist.c:910
+msgid "Public key is disabled.\n"
+msgstr "���_�Q�T�ΤF�C\n"
+
+#: g10/pkclist.c:917
+msgid "skipped: public key already set\n"
+msgstr "�w���L�G���_�w�g�Q�]�L�F\n"
+
+#: g10/pkclist.c:946
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "�������w�]����� `%s'\n"
+
+#: g10/pkclist.c:991
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: �w���L�G���_�w�g�Q�T�ΤF\n"
+
+#: g10/pkclist.c:1046
+msgid "no valid addressees\n"
+msgstr "�S�����Ī��a�}\n"
+
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "���n�]�w %c%lu ���ƤF\n"
+
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "���n�]�w `%c' �Ӧh\n"
+
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "���n�]�w `%c' �Ӧh\n"
+
+#: g10/keygen.c:218
+#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "���n�]�w `%c' �Ӧh\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "���n�]�w�r��̦��L�Ī��r��\n"
+
+#: g10/keygen.c:738
+msgid "writing direct signature\n"
+msgstr "���b�g�J����ñ��\n"
+
+#: g10/keygen.c:777
+msgid "writing self signature\n"
+msgstr "���b�g�J�ۧ�ñ��\n"
+
+#: g10/keygen.c:823
+msgid "writing key binding signature\n"
+msgstr "���b�g�J���_ñ��\n"
+
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "���_�ؤo�L�ġF��� %u �줸\n"
+
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "���_�ؤo�W�j�� %u �줸\n"
+
+#: g10/keygen.c:1165
+msgid "Please select what kind of key you want:\n"
+msgstr "�п�ܩp�n�ϥΪ����_�����G\n"
+
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal (default)\n"
+msgstr "   (%d) DSA �M ElGamal (�w�])\n"
+
+#: g10/keygen.c:1168
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (�ȯ�ñ�p��)\n"
+
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (�ȯ�[�K��)\n"
+
+#: g10/keygen.c:1171
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (�ȯ�ñ�p��)\n"
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (�ȯ�[�K��)\n"
+
+#: g10/keygen.c:1175
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (��ñ�p�Υ[�K)\n"
+
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
+msgid "Your selection? "
+msgstr "�p�n����@�ӡH "
+
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
+msgid "Invalid selection.\n"
+msgstr "�L�Ī���ܡC\n"
+
+#: g10/keygen.c:1225
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"���󲣥ͤ@�Ʒs�� %s ���_��C\n"
+"      �̰_�X�����_�ؤo�O  768 �줸\n"
+"        �w�]�����_�ؤo�O 1024 �줸\n"
+"    ��ij���̤j���_�ؤo�O 2048 �줸\n"
+
+#: g10/keygen.c:1234
+msgid "What keysize do you want? (1024) "
+msgstr "�p�Q�n�Φh�j�����_�ؤo�H (1024) "
+
+#: g10/keygen.c:1239
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA �����_�ؤo��श�� 512 �M 1024 ����\n"
+
+#: g10/keygen.c:1241
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "���_�ؤo�Ӥp�F RSA �����_�ؤo�̰_�X�����n�� 1024 �C\n"
+
+#: g10/keygen.c:1244
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "���_�ؤo�Ӥp�F�̰_�X�����n�� 768 �C\n"
+
+#: g10/keygen.c:1255
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "���_�ؤo�Ӥj�F�̤j�����Ψ� %d �C\n"
+
+#: g10/keygen.c:1260
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"����ij�ϥΤj�� 2048 �����_�ؤo�A\n"
+"�]���p�� *�u��* �|��h�ܦh�ɶ��I\n"
+
+#: g10/keygen.c:1263
+msgid "Are you sure that you want this keysize? "
+msgstr "�p�T�w�n�γo�Ӫ��_�ؤo�ܡH "
+
+#: g10/keygen.c:1264
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
+msgstr "�n�A���O�аO���p���ù��M��L�]�O�۷��e���Q�s�����z�I�I\n"
+
+#: g10/keygen.c:1273
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "�p�ҭn�D�����_�ؤo�O %u �줸\n"
+
+#: g10/keygen.c:1276 g10/keygen.c:1280
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "�[�j�� %u �줸\n"
+
+#: g10/keygen.c:1331
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+"�Ы��w�o����_�����Ĵ����O�h�[�C\n"
+"         0 = ���_���|�L��\n"
+"      <n>  = ���_�b n �ѫ�|�L��\n"
+"      <n>w = ���_�b n �g��|�L��\n"
+"      <n>m = ���_�b n ���|�L��\n"
+"      <n>y = ���_�b n �~��|�L��\n"
+
+#: g10/keygen.c:1340
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"�Ы��w�o��ñ�������Ĵ����O�h�[�C\n"
+"         0 = ���|�L��\n"
+"      <n>  = ñ���b n �ѫ�|�L��\n"
+"      <n>w = �b n �g��|�L��\n"
+"      <n>m = �b n ���|�L��\n"
+"      <n>y = �b n �~��|�L��\n"
+
+#: g10/keygen.c:1362
+msgid "Key is valid for? (0) "
+msgstr "���_�����Ĵ����O�h�[�H (0) "
+
+#: g10/keygen.c:1364
+msgid "Signature is valid for? (0) "
+msgstr "ñ�������Ĵ����O�h�[�H (0) "
+
+#: g10/keygen.c:1369
+msgid "invalid value\n"
+msgstr "�L�Ī��ƭ�\n"
+
+#: g10/keygen.c:1374
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr "%s �������|�L��\n"
+
+#: g10/keygen.c:1381
+#, c-format
+msgid "%s expires at %s\n"
+msgstr "%s �N�|�b %s �L��\n"
+
+#: g10/keygen.c:1387
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"�p���t�εL�k��� 2038 �~�H�᪺����C\n"
+"���L�A���i�H���T�B�z���� 2106 �~���e���~���C\n"
+
+#: g10/keygen.c:1392
+msgid "Is this correct (y/n)? "
+msgstr "�H�W���T�ܡH (y/n) "
+
+#: g10/keygen.c:1435
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"�p�ݭn�@�ӨϥΪ� ID �ӿ��ѩp�����_�F�o�ӳn��|�ίu��m�W�B\n"
+"�����M�q�l�l��a�}�զX���ϥΪ� ID �p�U�G\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+
+#: g10/keygen.c:1447
+msgid "Real name: "
+msgstr "�u��m�W�G "
+
+#: g10/keygen.c:1455
+msgid "Invalid character in name\n"
+msgstr "�m�W�t���L�Ī��r��\n"
+
+#: g10/keygen.c:1457
+msgid "Name may not start with a digit\n"
+msgstr "�m�W���i�H�μƦr�}�Y\n"
+
+#: g10/keygen.c:1459
+msgid "Name must be at least 5 characters long\n"
+msgstr "�m�W�ܤ֭n�����Ӧr�Ū�\n"
+
+#: g10/keygen.c:1467
+msgid "Email address: "
+msgstr "�q�l�l��a�}�G "
+
+#: g10/keygen.c:1478
+msgid "Not a valid email address\n"
+msgstr "���O���Ī��q�l�l��a�}\n"
+
+#: g10/keygen.c:1486
+msgid "Comment: "
+msgstr "�����G "
+
+#: g10/keygen.c:1492
+msgid "Invalid character in comment\n"
+msgstr "�����t���L�Ī��r��\n"
+
+#: g10/keygen.c:1515
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "�p���b�ϥ� `%s' �r�����C\n"
+
+#: g10/keygen.c:1521
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"�p��ܤF�o�ӨϥΪ� ID �G\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:1526
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "�Ф��n��q�l�l��a�}��i�p���u��m�W�ε�����\n"
+
+#: g10/keygen.c:1531
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:1541
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�ΰh�X(Q)�H "
+
+#: g10/keygen.c:1542
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�νT�w(O)/�h�X(Q)�H "
+
+#: g10/keygen.c:1561
+msgid "Please correct the error first\n"
+msgstr "���q�����~\n"
+
+#: g10/keygen.c:1600
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"�p�ݭn�@�ӱK�X��ӫO�@�p���p�_�C\n"
+"\n"
+
+#: g10/keygen.c:1609 g10/keyedit.c:1021
+msgid "passphrase not correctly repeated; try again"
+msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
+
+#: g10/keygen.c:1610
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:1616
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway.  You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"�p���Q�n���K�X�� �w �o�ӷQ�k��b�O **�D�z�F** �I\n"
+"�ڤ��M�|�өp�Q���h���C�p����ɭԳ��i�H�ܧ�p���K�X��A\n"
+"�Ȼݭn�A������o�ӵ{���A�åB�ϥ� \"--edit-key\" �ﶵ�Y�i�C\n"
+"\n"
+
+#: g10/keygen.c:1638
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"�ڭ̻ݭn���ͤj�q���H���줸�աC�o�Ӯɭԩp�i�H�h���@�ǨƱ�\n"
+"�]���O�V����L�B���ʷƹ��BŪ�g�w�Ф������^\n"
+"�o�|���H���Ʀr���;�����h�����|��o���h���üơC\n"
+
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "��p�A�L�k�b�妸�Ҧ����o�˰�\n"
+
+#: g10/keygen.c:2267
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "DSA ���_��|�� 1024 �줸�C\n"
+
+#: g10/keygen.c:2335
+msgid "Key generation canceled.\n"
+msgstr "�w�������_���͡C\n"
+
+#: g10/keygen.c:2451 g10/keygen.c:2576
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "���b�N���_�g�� `%s'\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "���b�N�p�_�g�� `%s'\n"
+
+#: g10/keygen.c:2456 g10/keygen.c:2582
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "���b�N�p�_�g�� `%s'\n"
+
+#: g10/keygen.c:2565
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "�䤣��i�g�����_�_�Ͱ�G %s\n"
+
+#: g10/keygen.c:2571
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "�䤣��i�g���p�_�_�Ͱ�G %s\n"
+
+#: g10/keygen.c:2589
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "�g�J���_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+
+#: g10/keygen.c:2596
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+
+#: g10/keygen.c:2619
+msgid "public and secret key created and signed.\n"
+msgstr "���_�M�p�_�w�g�Q�إߤ�ñ�p�F�C\n"
+
+#: g10/keygen.c:2630
+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 ""
+"�Ъ`�N�o����_����Ψӥ[�K���ΡC�p������ \"--edit-key\" ���O\n"
+"�Ӳ��ͦ��_�צ�C\n"
+
+#: g10/keygen.c:2642 g10/keygen.c:2755
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/keygen.c:2691 g10/sign.c:290
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
+
+#: g10/keygen.c:2693 g10/sign.c:292
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
+
+#: g10/keygen.c:2702
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr "�Ъ`�N�G�� v3 ���_�s�y�l�_�|���h OpenPGP �ۮe��\n"
+
+#: g10/keygen.c:2730
+msgid "Really create? "
+msgstr "�u���n�إ߶ܡH "
+
+#: g10/decrypt.c:98 g10/encode.c:845
+msgid "--output doesn't work for this command\n"
+msgstr "--output �b�o�өR�O���S���@��\n"
+
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: �L�k�}�ҡG %s\n"
+
+#: g10/encode.c:203 g10/sign.c:1144
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
+
+#: g10/encode.c:208
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "�]���B�� S2K �Ҧ��U�ӵL�k�ϥι�٦� ESK �ʥ]\n"
+
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "ñ�p�ɥ��ѤF�G %s\n"
+
+#: g10/encode.c:231 g10/encode.c:544
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "`%s' �w�g�Q���Y�F\n"
+
+#: g10/encode.c:301 g10/encode.c:590
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: ĵ�i�G�o�O���ɮ�\n"
+
+#: g10/encode.c:465
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr "�b --pgp2 �Ҧ����A�p���H 2048 �줸�H�U�� RSA ���_�[�K\n"
+
+#: g10/encode.c:480
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "���b�q `%s' Ū����\n"
+
+#: g10/encode.c:516
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr "�p���n�Ψӥ[�K���Ҧ����_������ϥ� IDEA �s�K�k�C\n"
+
+#: g10/encode.c:526 g10/encode.c:721
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
+
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "�j���ϥ� %s (%d) ���Y�t��k�|�H�Ϧ���̰��n�]�w\n"
+
+#: g10/encode.c:818
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s �w�g�[�K���G \"%s\"\n"
+
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "�䤣�� `%s' ���_�G %s\n"
+
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "Ū�����_�϶��ɵo�Ϳ��~�G %s\n"
+
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "���_ %08lX: ���Q�O�@ �w �w���L\n"
+
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "���_ %08lX: PGP 2.x �˦������_ �w �w���L\n"
+
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "�Чi�G�p�_ %08lX �èS���������@ SK �[�`�ˬd\n"
+
+#: g10/export.c:385
+msgid "WARNING: nothing exported\n"
+msgstr "ĵ�i�G�S���ץX����F��\n"
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr "pk �֨��̦��Ӧh���� �w �w�T��\n"
+
+#: g10/getkey.c:186 g10/getkey.c:2693
+msgid "[User id not found]"
+msgstr "[�䤣��ϥΪ� ID]"
+
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "--allow-non-selfsigned-uid �����L�Ī����_ %08lX �ͮ�\n"
+
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "���_ %08lX �S���۹������p�_ �w ���b����\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
+msgstr "���b�ϥΦ��_ %08lX �Ӵ����D�_ %08lX\n"
+
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "���_ %08lX: �馳�p�_�ӨS�����_ �w �w���L\n"
+
+#: g10/import.c:241
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "���b���L %d ���A���϶�\n"
+
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
+msgstr "�w�� %lu ����_�Q�B�z�F\n"
+
+#: g10/import.c:255
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "Ū�� `%s' �ɵo�Ϳ��~�G %s\n"
+
+#: g10/import.c:267
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "�`�@�Q�B�z���ƶq�G %lu\n"
+
+#: g10/import.c:269
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "       �w���L���s���_�G %lu\n"
+
+#: g10/import.c:272
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "      �S���ϥΪ̪� ID�G %lu\n"
+
+#: g10/import.c:274
+#, c-format
+msgid "              imported: %lu"
+msgstr "               �w�פJ�G %lu"
+
+#: g10/import.c:280
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "             �����ܪ��G %lu\n"
+
+#: g10/import.c:282
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "        �s���ϥΪ� ID�G %lu\n"
+
+#: g10/import.c:284
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "             �s���l�_�G %lu\n"
+
+#: g10/import.c:286
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "             �s���G %lu\n"
+
+#: g10/import.c:288
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "         �s�����_�M�P�G %lu\n"
+
+#: g10/import.c:290
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "         �QŪ�����p�_�G %lu\n"
+
+#: g10/import.c:292
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "         �w�פJ���p�_�G %lu\n"
+
+#: g10/import.c:294
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr "         �����ܪ��p�_�G %lu\n"
+
+#: g10/import.c:296
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr "             ���Q�פJ�G %lu\n"
+
+#: g10/import.c:537
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
+
+#: g10/import.c:576
+#, c-format
+msgid "         \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
+#, fuzzy, c-format
+msgid "         \"%s\": preference for digest algorithm %s\n"
+msgstr "%s �A�K�n�t��k %s\n"
+
+#: g10/import.c:600
+#, c-format
+msgid "         \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
+
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
+#, c-format
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "���_ %08lX: �S���ϥΪ� ID\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "���_ %08lX: HKP �l�_���_�~�w�Q�״_\n"
+
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "���_ %08lX: �D�ۧ�ñ�p���ϥΪ� ID `%s' �w�Q����\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "���_ %08lX: �S�����Ī��ϥΪ� ID\n"
+
+#: g10/import.c:730
+msgid "this may be caused by a missing self-signature\n"
+msgstr "�o�i��O�ѩ�򥢦ۧ�ñ���ҾɭP����G\n"
+
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "���_ %08lX: �䤣�줽�_�G %s\n"
+
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "���_ %08lX: �s���_ �w �w���L\n"
+
+#: g10/import.c:755
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "�䤣��i�g���_�Ͱ�G %s\n"
+
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "���b�g�� `%s'\n"
+
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "�g���_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+
+#: g10/import.c:785
+#, fuzzy, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "���_ %08lX: ���_ \"%s\" �w�Q�פJ\n"
+
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "���_ %08lX: ��ڭ̪��ƥ����k�X\n"
+
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "���_ %08lX: �L�k�w���l�����_�϶��G %s\n"
+
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "���_ %08lX: �L�kŪ����l�����_�϶��G %s\n"
+
+#: g10/import.c:866
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "���_ %08lX: \"%s\" 1 �ӷs���ϥΪ� ID\n"
+
+#: g10/import.c:869
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "���_ %08lX: \"%s\" %d �ӷs���ϥΪ� ID\n"
+
+#: g10/import.c:872
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "���_ %08lX: \"%s\" 1 �ӷs��ñ��\n"
+
+#: g10/import.c:875
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "���_ %08lX: \"%s\" %d �ӷs��ñ��\n"
+
+#: g10/import.c:878
+#, fuzzy, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "���_ %08lX: \"%s\" 1 �ӷs���l�_\n"
+
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "���_ %08lX: \"%s\" %d �ӷs���l�_\n"
+
+#: g10/import.c:902
+#, fuzzy, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "���_ %08lX: \"%s\" �S���Q����\n"
+
+#: g10/import.c:1047
+#, fuzzy, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "���_ %08lX: �p�_�ϥΤF�L�Ī��s�K�k %d �w �w���L\n"
+
+#: g10/import.c:1064
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "�S���w�]���p�_�_�Ͱ�G %s\n"
+
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
+msgstr "���_ %08lX: �p�_�Q�פJ�F\n"
+
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "���_ %08lX: �w�g�b�p�_�_�Ͱ餤�F\n"
+
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "���_ %08lX: �䤣��p�_�G %s\n"
+
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr "���_ %08lX: �S�����_ �w �L�k�M�κM�P����\n"
+
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w��^\n"
+
+#: g10/import.c:1219
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "���_ %08lX: \"%s\" �M�P���Ҥw�Q�פJ\n"
+
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "���_ %08lX: ñ���S���ϥΪ� ID\n"
+
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "���_ %08lX: �ϥΪ� ID \"%s\" �ϥΤF���Q�䴩�����}���_�t��k\n"
+
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "���_ %08lX: �ϥΪ� ID \"%s\" ���L�Ī��ۧ�ñ��\n"
+
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
+
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "���_ %08lX: ���Q�䴩�����}���_�t��k\n"
+
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "���_ %08lX: �L�Ī����a�l�_\n"
+
+#: g10/import.c:1347
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "���_ %08lX: �h�����a�l�_�w�Q����\n"
+
+#: g10/import.c:1369
+#, fuzzy, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "���_ %08lX: �S���l�_�i�Ѫ��_�M�P\n"
+
+#: g10/import.c:1382
+#, fuzzy, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "���_ %08lX: �L�Ī��l�_�M�P\n"
+
+#: g10/import.c:1397
+#, fuzzy, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "���_ %08lX: �h���l�_�M�P�w����\n"
+
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
+msgstr "���_ %08lX: �w���L�ϥΪ� ID '"
+
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "���_ %08lX: �l�_�w���L\n"
+
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
+msgstr "���_ %08lX: ���i�ץX��ñ�� (���� %02x) �w �w���L\n"
+
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "���_ %08lX: �M�P���Ҧb���~���a�� �w �w���L\n"
+
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w���L\n"
+
+#: g10/import.c:1528
+#, fuzzy, c-format
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "���_ %08lX: �l�_�b���~���a�� �w �w���L\n"
+
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "���_ %08lX: �D�w�������� (0x%02X) �w �w���L\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "���_ %08lX: �����쭫�ƪ��ϥΪ� ID �w �w�X��\n"
+
+#: g10/import.c:1698
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G���b���^�M�P���_ %08lX\n"
+
+#: g10/import.c:1711
+#, fuzzy, c-format
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G�M�P���_ %08lX ���X�{�C\n"
+
+#: g10/import.c:1770
+#, fuzzy, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "���_ %08lX: �w�s�W�M�P���� \"%s\"\n"
+
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "���_ %08lX: �w�s�W�������_ñ��\n"
+
+#: g10/keyedit.c:159
+msgid "[revocation]"
+msgstr "[�M�P]"
+
+#: g10/keyedit.c:160
+msgid "[self-signature]"
+msgstr "[�ۧ�ñ��]"
+
+#: g10/keyedit.c:237 g10/keylist.c:319
+msgid "1 bad signature\n"
+msgstr "1 �ӷl�a��ñ��\n"
+
+#: g10/keyedit.c:239 g10/keylist.c:321
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d �ӷl�a��ñ��\n"
+
+#: g10/keyedit.c:241 g10/keylist.c:323
+msgid "1 signature not checked due to a missing key\n"
+msgstr "�� 1 ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
+
+#: g10/keyedit.c:243 g10/keylist.c:325
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "�� %d ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
+
+#: g10/keyedit.c:245 g10/keylist.c:327
+msgid "1 signature not checked due to an error\n"
+msgstr "�� 1 ��ñ���]���Y�ӿ��~�ӥ��Q�ˬd\n"
+
+#: g10/keyedit.c:247 g10/keylist.c:329
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "�� %d ��ñ���]���Y�ǿ��~�ӥ��Q�ˬd\n"
+
+#: g10/keyedit.c:249
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "������ 1 �ӨS�����Ħۧ�ñ�����ϥΪ� ID\n"
+
+#: g10/keyedit.c:251
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "������ %d �ӨS�����Ħۧ�ñ�����ϥΪ� ID\n"
+
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid "   (%d) I trust marginally\n"
+msgstr " %d = �ګj�j�H��\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid "   (%d) I trust fully\n"
+msgstr " %d = �ڧ����H��\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
+
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "�p���M�Q�nñ�p���ܡH (y/N) "
+
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
+msgid "  Unable to sign.\n"
+msgstr "  �L�kñ�p�C\n"
+
+#: g10/keyedit.c:519
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
+
+#: g10/keyedit.c:545
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "ĵ�i�G�ϥΪ� ID \"%s\" ���g�ۧ�ñ�p�C\n"
+
+#: g10/keyedit.c:584
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"\"%s\" �̪��ۧ�ñ��\n"
+"�O PGP 2.x ���A���C\n"
+
+#: g10/keyedit.c:593
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "�p�O�_�Q�n�N���ɯŦ� OpenPGP �ۧ�ñ���H (y/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"�p�ثe�b \"%s\" ��ñ��\n"
+"�w�g�L���F�C\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "�p�Q�n�o�G�@���s��ñ���Ө��N�w�L�������@�ӶܡH (y/N) "
+
+#: g10/keyedit.c:632
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"�p�ثe�b \"%s\" ��ñ��\n"
+"�O�@�����a�C\n"
+
+#: g10/keyedit.c:636
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "�p�O�_�Q�n��L�ɯŦ��i�H�����ץX��ñ���H (y/N) "
+
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "\"%s\" �w�g�Q���_ %08lX �b���añ�p�F\n"
+
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "\"%s\" �w�g�Q���_ %08lX ñ�p�F\n"
+
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "�p���M�Q�n�A��ñ�p���ܡH (y/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "�S���F��i�H�����_ %08lX ñ�p\n"
+
+#: g10/keyedit.c:702
+msgid "This key has expired!"
+msgstr "�o����_�w�g�L���F�I"
+
+#: g10/keyedit.c:722
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "�o����_�N�b %s �L���C\n"
+
+#: g10/keyedit.c:726
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "�p�Q�n���p��ñ���]�b�P�@�ӮɭԹL���ܡH (Y/n) "
+
+#: g10/keyedit.c:759
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr "�p����b --pgp2 �Ҧ��U�A�� PGP 2.x ���_���X OpenPGP ñ���C\n"
+
+#: g10/keyedit.c:761
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "�o�|���o����_�b PGP 2.x �Ҧ��U���i�ϥΡC\n"
+
+#: g10/keyedit.c:786
+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 ""
+"�p���h�ԷV�ˬd���nñ�p�����_�T���ݩ�W�����ӤH���W�r�O�H\n"
+"�p�G�p�����D�o�Ӱ��D�����סA�п�J�u0�v�C\n"
+
+#: g10/keyedit.c:791
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr "   (0) �ڤ��@���C %s\n"
+
+#: g10/keyedit.c:793
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr "   (1) �ڮڥ��S���ˬd�L�C %s\n"
+
+#: g10/keyedit.c:795
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr "   (2) ���H�N�ˬd�L�F�C %s\n"
+
+#: g10/keyedit.c:797
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) �ګD�`�p�ߦa�ˬd�L�F�C %s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr ""
+
+#: g10/keyedit.c:826
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"�p�u���T�w�nñ�p�o����_\n"
+"�Ωp�����_�G \""
+
+#: g10/keyedit.c:835
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"\n"
+"�o�N�|�O�ۧ�ñ���C\n"
+
+#: g10/keyedit.c:839
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"ĵ�i�G�o��ñ�����|�Q�аO�����i�ץX�C\n"
+
+#: g10/keyedit.c:844
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"ĵ�i�G�o��ñ�����|�Q�аO�����i�M�P�C\n"
+
+#: g10/keyedit.c:851
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"�o��ñ���|�Q�аO�����i�ץX�C\n"
+
+#: g10/keyedit.c:855
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"�o��ñ���|�Q�аO�����i�M�P�C\n"
+
+#: g10/keyedit.c:860
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+"\n"
+"�ڮڥ��S���ˬd�L�o����_�C\n"
+
+#: g10/keyedit.c:864
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+"\n"
+"���H�N�ˬd�L�o����_�F�C\n"
+
+#: g10/keyedit.c:868
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+"\n"
+"�ګD�`�p�ߦa�ˬd�L�o����_�F�C\n"
+
+#: g10/keyedit.c:877
+msgid "Really sign? "
+msgstr "�u���nñ�p�ܡH "
+
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "ñ�p�ɥ��ѤF�G %s\n"
+
+#: g10/keyedit.c:978
+msgid "This key is not protected.\n"
+msgstr "�o����_�S���Q�O�@�C\n"
+
+#: g10/keyedit.c:982
+msgid "Secret parts of primary key are not available.\n"
+msgstr "�D�_���p�_�����S��k���ΡC\n"
+
+#: g10/keyedit.c:986
+msgid "Key is protected.\n"
+msgstr "���_�Q�O�@�F�C\n"
+
+#: g10/keyedit.c:1006
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "�L�k�s��o����_�G %s\n"
+
+#: g10/keyedit.c:1012
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"��J�n���o��p�_���s�K�X��C\n"
+"\n"
+
+#: g10/keyedit.c:1026
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"�p���Q�n�αK�X�� �w �o�j���O�� *�V* �I�l�I\n"
+"\n"
+
+#: g10/keyedit.c:1029
+msgid "Do you really want to do this? "
+msgstr "�p�u���Q�n�o�򰵶ܡH "
+
+#: g10/keyedit.c:1095
+msgid "moving a key signature to the correct place\n"
+msgstr "���b����_��ñ���h���쥿�T����m�h\n"
+
+#: g10/keyedit.c:1138
+msgid "quit this menu"
+msgstr "���}�o�ӿ��"
+
+#: g10/keyedit.c:1139
+msgid "q"
+msgstr "q"
+
+#: g10/keyedit.c:1140
+msgid "save"
+msgstr "save"
+
+#: g10/keyedit.c:1140
+msgid "save and quit"
+msgstr "�x�s�����}"
+
+#: g10/keyedit.c:1141
+msgid "help"
+msgstr "help"
+
+#: g10/keyedit.c:1141
+msgid "show this help"
+msgstr "��ܳo���u�W����"
+
+#: g10/keyedit.c:1143
+msgid "fpr"
+msgstr "fpr"
+
+#: g10/keyedit.c:1143
+msgid "show fingerprint"
+msgstr "��ܫ���"
+
+#: g10/keyedit.c:1144
+msgid "list"
+msgstr "list"
+
+#: g10/keyedit.c:1144
+msgid "list key and user IDs"
+msgstr "�C�X���_�M�ϥΪ� ID"
+
+#: g10/keyedit.c:1145
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:1146
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:1146
+msgid "select user ID N"
+msgstr "�ϥΪ� ID ��F N"
+
+#: g10/keyedit.c:1147
+msgid "key"
+msgstr "key"
+
+#: g10/keyedit.c:1147
+msgid "select secondary key N"
+msgstr "��ܦ��_ N"
+
+#: g10/keyedit.c:1148
+msgid "check"
+msgstr "check"
+
+#: g10/keyedit.c:1148
+msgid "list signatures"
+msgstr "�C�Xñ��"
+
+#: g10/keyedit.c:1149
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:1150
+msgid "sign"
+msgstr "sign"
+
+#: g10/keyedit.c:1150
+msgid "sign the key"
+msgstr "ñ�p���_"
+
+#: g10/keyedit.c:1151
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "�إߤ@��������ñ��"
+
+#: g10/keyedit.c:1153
+msgid "lsign"
+msgstr "lsign"
+
+#: g10/keyedit.c:1153
+msgid "sign the key locally"
+msgstr "�Ȧb���añ�p���_"
+
+#: g10/keyedit.c:1154
+msgid "nrsign"
+msgstr "nrsign"
+
+#: g10/keyedit.c:1154
+msgid "sign the key non-revocably"
+msgstr "�H���i�M�P�Ҧ�ñ�p���_"
+
+#: g10/keyedit.c:1155
+msgid "nrlsign"
+msgstr "nrlsign"
+
+#: g10/keyedit.c:1155
+msgid "sign the key locally and non-revocably"
+msgstr "�H���i�M�P�Ҧ��b���añ�p���_"
+
+#: g10/keyedit.c:1156
+msgid "debug"
+msgstr "debug"
+
+#: g10/keyedit.c:1157
+msgid "adduid"
+msgstr "adduid"
+
+#: g10/keyedit.c:1157
+msgid "add a user ID"
+msgstr "�W�[�@�ӨϥΪ� ID"
+
+#: g10/keyedit.c:1158
+msgid "addphoto"
+msgstr "addphoto"
+
+#: g10/keyedit.c:1158
+msgid "add a photo ID"
+msgstr "�W�[�@�ӷӤ� ID"
+
+#: g10/keyedit.c:1159
+msgid "deluid"
+msgstr "deluid"
+
+#: g10/keyedit.c:1159
+msgid "delete user ID"
+msgstr "�R���@�ӨϥΪ� ID"
+
+#: g10/keyedit.c:1161
+msgid "delphoto"
+msgstr "delphoto"
+
+#: g10/keyedit.c:1162
+msgid "addkey"
+msgstr "addkey"
+
+#: g10/keyedit.c:1162
+msgid "add a secondary key"
+msgstr "�W�[�@�⦸�_"
+
+#: g10/keyedit.c:1163
+msgid "delkey"
+msgstr "delkey"
+
+#: g10/keyedit.c:1163
+msgid "delete a secondary key"
+msgstr "�R���@�⦸�_"
+
+#: g10/keyedit.c:1164
+msgid "addrevoker"
+msgstr "addrevoker"
+
+#: g10/keyedit.c:1164
+msgid "add a revocation key"
+msgstr "�W�[�@��M�P���_"
+
+#: g10/keyedit.c:1165
+msgid "delsig"
+msgstr "delsig"
+
+#: g10/keyedit.c:1165
+msgid "delete signatures"
+msgstr "�R��ñ��"
+
+#: g10/keyedit.c:1166
+msgid "expire"
+msgstr "expire"
+
+#: g10/keyedit.c:1166
+msgid "change the expire date"
+msgstr "���ϥδ���"
+
+#: g10/keyedit.c:1167
+msgid "primary"
+msgstr "primary"
+
+#: g10/keyedit.c:1167
+msgid "flag user ID as primary"
+msgstr "��ϥΪ� ID �аO���D�n"
+
+#: g10/keyedit.c:1168
+msgid "toggle"
+msgstr "toggle"
+
+#: g10/keyedit.c:1168
+msgid "toggle between secret and public key listing"
+msgstr "��p�_�M���_�M��ô�b�@�_"
+
+#: g10/keyedit.c:1170
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:1171
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:1171
+msgid "list preferences (expert)"
+msgstr "�C�X���n (�M�a�Ҧ�)"
+
+#: g10/keyedit.c:1172
+msgid "showpref"
+msgstr "showpref"
+
+#: g10/keyedit.c:1172
+msgid "list preferences (verbose)"
+msgstr "�C�X���n (�o���Ҧ�)"
+
+#: g10/keyedit.c:1173
+msgid "setpref"
+msgstr "setpref"
+
+#: g10/keyedit.c:1173
+msgid "set preference list"
+msgstr "�]�w���n�M��"
+
+#: g10/keyedit.c:1174
+msgid "updpref"
+msgstr "updpref"
+
+#: g10/keyedit.c:1174
+msgid "updated preferences"
+msgstr "��s�L�����n"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "���_���A�����~"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "�L�k���R���_���A�� URI\n"
+
+#: g10/keyedit.c:1176
+msgid "passwd"
+msgstr "passwd"
+
+#: g10/keyedit.c:1176
+msgid "change the passphrase"
+msgstr "���K�X��"
+
+#: g10/keyedit.c:1177
+msgid "trust"
+msgstr "trust"
+
+#: g10/keyedit.c:1177
+msgid "change the ownertrust"
+msgstr "���D�[�H��"
+
+#: g10/keyedit.c:1178
+msgid "revsig"
+msgstr "revsig"
+
+#: g10/keyedit.c:1178
+msgid "revoke signatures"
+msgstr "�M�Pñ��"
+
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "�M�P�@�ӨϥΪ� ID"
+
+#: g10/keyedit.c:1180
+msgid "revkey"
+msgstr "revkey"
+
+#: g10/keyedit.c:1180
+msgid "revoke a secondary key"
+msgstr "�M�P�@�⦸�_"
+
+#: g10/keyedit.c:1181
+msgid "disable"
+msgstr "disable"
+
+#: g10/keyedit.c:1181
+msgid "disable a key"
+msgstr "�T�Τ@����_"
+
+#: g10/keyedit.c:1182
+msgid "enable"
+msgstr "enable"
+
+#: g10/keyedit.c:1182
+msgid "enable a key"
+msgstr "�ҥΤ@����_"
+
+#: g10/keyedit.c:1183
+msgid "showphoto"
+msgstr "showphoto"
+
+#: g10/keyedit.c:1183
+msgid "show photo ID"
+msgstr "��ܷӤ� ID"
+
+#: g10/keyedit.c:1202 g10/delkey.c:120
+msgid "can't do that in batchmode\n"
+msgstr "�L�k�b�妸�Ҧ������˰�\n"
+
+#: g10/keyedit.c:1233
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "Ū�����_�϶� `%s' �ɵo�Ϳ��~�G %s\n"
+
+#: g10/keyedit.c:1250
+msgid "Secret key is available.\n"
+msgstr "�p�_�i�ΡC\n"
+
+#: g10/keyedit.c:1282
+msgid "Command> "
+msgstr "���O> "
+
+#: g10/keyedit.c:1312
+msgid "Need the secret key to do this.\n"
+msgstr "�n���p�_�ׯ�o�򰵡C\n"
+
+#: g10/keyedit.c:1316
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "�Х��ϥ� \"toggle\" ���O�C\n"
+
+#: g10/keyedit.c:1364
+msgid "Key is revoked."
+msgstr "���_�w�g�Q�M�P�F�C"
+
+#: g10/keyedit.c:1383
+msgid "Really sign all user IDs? "
+msgstr "�u���nñ�p�Ҧ����ϥΪ� ID �ܡH "
+
+#: g10/keyedit.c:1384
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "���ܡG��ܭnñ�p���ϥΪ� ID\n"
+
+#: g10/keyedit.c:1409
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "�b %s �Ҧ��������\�ϥγo�ӫ��O�C\n"
+
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
+msgid "You must select at least one user ID.\n"
+msgstr "�p�ܤֱo��ܤ@�ӨϥΪ� ID �C\n"
+
+#: g10/keyedit.c:1433
+msgid "You can't delete the last user ID!\n"
+msgstr "�p����R���̫�@�ӨϥΪ� ID �I\n"
+
+#: g10/keyedit.c:1436
+msgid "Really remove all selected user IDs? "
+msgstr "�u���n�����Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
+
+#: g10/keyedit.c:1437
+msgid "Really remove this user ID? "
+msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
+
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
+msgid "You must select at least one key.\n"
+msgstr "�p�ܤ֥�����ܤ@����_�C\n"
+
+#: g10/keyedit.c:1478
+msgid "Do you really want to delete the selected keys? "
+msgstr "�p�u���Q�n�R���Q��ܪ����_�ܡH "
+
+#: g10/keyedit.c:1479
+msgid "Do you really want to delete this key? "
+msgstr "�p�u���n�R���o����_�ܡH "
+
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "�u���n�M�P�Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "�u���n�M�P�o�ӨϥΪ� ID �ܡH "
+
+#: g10/keyedit.c:1534
+msgid "Do you really want to revoke the selected keys? "
+msgstr "�p�u���Q�n�M�P�o�dzQ��ܪ����_�ܡH "
+
+#: g10/keyedit.c:1535
+msgid "Do you really want to revoke this key? "
+msgstr "�p�u���Q�n�M�P�o����_�ܡH "
+
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "�]�w���n�M��"
+
+#: g10/keyedit.c:1612
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "�u���n��s�Q��ܨϥΪ� ID �����n�ܡH "
+
+#: g10/keyedit.c:1614
+msgid "Really update the preferences? "
+msgstr "�u���n��s���n�ܡH "
+
+#: g10/keyedit.c:1662
+msgid "Save changes? "
+msgstr "�n�x�s�ܧ�ܡH "
+
+#: g10/keyedit.c:1665
+msgid "Quit without saving? "
+msgstr "�n���x�s�����}�ܡH "
+
+#: g10/keyedit.c:1675
+#, c-format
+msgid "update failed: %s\n"
+msgstr "��s���ѡG %s\n"
+
+#: g10/keyedit.c:1682
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "��s�p�_���ѡG %s\n"
+
+#: g10/keyedit.c:1689
+msgid "Key not changed so no update needed.\n"
+msgstr "���_�S���ܧ�ҥH���ݭn��s�C\n"
+
+#: g10/keyedit.c:1701
+msgid "Invalid command  (try \"help\")\n"
+msgstr "�L�Ī����O  (�ոլ� \"help\")\n"
+
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "�K�n�G "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "�S�I�G "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr "�o����_�i��Q %s ���_�M�P�F "
+
+#: g10/keyedit.c:2067
+msgid " (sensitive)"
+msgstr " �]���K���^"
+
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "�L�k�إ� %s: %s\n"
+
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[�w�M�P]"
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [���Ĵ����G %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [���Ĵ����G %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
+msgstr " �H���G %c/%c"
+
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
+msgid "This key has been disabled"
+msgstr "�o����_�w�g�Q�T�ΤF"
+
+#: g10/keyedit.c:2146
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! �l�_�w�g�Q�M�P�F�G %s\n"
+
+#: g10/keyedit.c:2149
+msgid "rev- faked revocation found\n"
+msgstr "rev- �o�{�Q���y���M�P\n"
+
+#: g10/keyedit.c:2151
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? �ˬd�M�P�ɵo�Ͱ��D�G %s\n"
+
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[�w�M�P]"
+
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "PGP 2.x ���A���ϥΪ� ID �S�����n�C\n"
+
+#: g10/keyedit.c:2207
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"�Ъ`�N��ܥX�Ӫ����_���ĩʤ��ݭn�󥿡A\n"
+"���D�p���s����{���C\n"
+
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[�w�M�P]"
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[�w�L��]"
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2399
+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 ""
+"ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
+"      �W�[�Ӥ� ID �i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
+
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "�p�T�w���M�Q�n�W�[�ܡH (y/N) "
+
+#: g10/keyedit.c:2410
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "�p���i�H��Ӥ� ID �W�[�� PGP2 ���A�����_�̡C\n"
+
+#: g10/keyedit.c:2545
+msgid "Delete this good signature? (y/N/q)"
+msgstr "�R���o�ӧ��n��ñ���ܡH (y/N/q)"
+
+#: g10/keyedit.c:2555
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "�R���o�ӵL�Ī�ñ���ܡH (y/N/q)"
+
+#: g10/keyedit.c:2559
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "�R���o�ӥ�����ñ���ܡH (y/N/q)"
+
+#: g10/keyedit.c:2565
+msgid "Really delete this self-signature? (y/N)"
+msgstr "�u���n�R���o�Ӧۧ�ñ���ܡH (y/N)"
+
+#: g10/keyedit.c:2579
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "�w�g�R���F %d ���C\n"
+
+#: g10/keyedit.c:2580
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "�w�g�R���F %d ���C\n"
+
+#: g10/keyedit.c:2583
+msgid "Nothing deleted.\n"
+msgstr "�S���F��Q�R���C\n"
+
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr ""
+"ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
+"      �W�[���w�M�P�̥i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "�p���i�H����w�M�P�̼W�[�� PGP2 ���A�����_�̡C\n"
+
+#: g10/keyedit.c:2703
+msgid "Enter the user ID of the designated revoker: "
+msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
+
+#: g10/keyedit.c:2726
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
+
+#: g10/keyedit.c:2741
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
+
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "�p�T�w�n�����o����_�����w�M�P�̶ܡH (y/N): "
+
+#: g10/keyedit.c:2849
+msgid "Please remove selections from the secret keys.\n"
+msgstr "�бq�p�_��������ܡC\n"
+
+#: g10/keyedit.c:2855
+msgid "Please select at most one secondary key.\n"
+msgstr "�Цܦh��ܤ@�⦸�_�C\n"
+
+#: g10/keyedit.c:2859
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "���b�ܧ�Y�⦸�_���ϥδ����C\n"
+
+#: g10/keyedit.c:2862
+msgid "Changing expiration time for the primary key.\n"
+msgstr "���b�ܧ�D�_���ϥδ����C\n"
+
+#: g10/keyedit.c:2908
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "�p�����ܧ� v3 ���_���ϥδ���\n"
+
+#: g10/keyedit.c:2924
+msgid "No corresponding signature in secret ring\n"
+msgstr "�b�p�_��̨S���@�P��ñ��\n"
+
+#: g10/keyedit.c:3004
+msgid "Please select exactly one user ID.\n"
+msgstr "�к�T�a��ܤ@�ӨϥΪ� ID �C\n"
+
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "���b�ϥΪ� ID \"%s\" ���L v3 �ۧ�ñ��\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
+
+#: g10/keyedit.c:3331
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "���� %d �S���ϥΪ� ID\n"
+
+#: g10/keyedit.c:3377
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "���� %d �S�����_\n"
+
+#: g10/keyedit.c:3491
+msgid "user ID: \""
+msgstr "�ϥΪ� ID�G \""
+
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"�w�g�Q�p�����_ %08lX ñ�p�� %s\n"
+
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %s at %s\n"
+msgstr ""
+"\"\n"
+"�w�g�Q�p�����_ %08lX �b���añ�p�� %s\n"
+
+#: g10/keyedit.c:3504
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+
+#: g10/keyedit.c:3508
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "�p�T�w�p���M�Q�n�M�P���ܡH (y/N) "
+
+#: g10/keyedit.c:3512
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "�n���o��ñ���إߤ@���M�P���ҶܡH (y/N) "
+
+#: g10/keyedit.c:3537
+msgid "You have signed these user IDs:\n"
+msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
+
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s%s\n"
+msgstr "   �� %08lX ñ�p�� %s%s%s\n"
+
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid "   revoked by %s on %s\n"
+msgstr "   �� %08lX �M�P�� %s\n"
+
+#: g10/keyedit.c:3587
+msgid "You are about to revoke these signatures:\n"
+msgstr "�p���b�M�P�o���G\n"
+
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid "   signed by %s on %s%s\n"
+msgstr "   �� %08lX ñ�p�� %s%s\n"
+
+#: g10/keyedit.c:3599
+msgid " (non-exportable)"
+msgstr " (���i�ץX)"
+
+#: g10/keyedit.c:3606
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "�u���n�إߺM�P���ҶܡH (y/N) "
+
+#: g10/keyedit.c:3636
+msgid "no secret key\n"
+msgstr "�S���p�_\n"
+
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
+
+#: g10/keyedit.c:3723
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "ĵ�i�G���@���ϥΪ� ID ñ��������аO�� %d ���᪺����\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "���b��� %s �ؤo�� %ld �����_ 0x%08lX (uid %d) ���Ӥ� ID\n"
+
+#: g10/keylist.c:179
+msgid "Critical signature policy: "
+msgstr "������h�G "
+
+#: g10/keylist.c:181
+msgid "Signature policy: "
+msgstr "��h�G "
+
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
+msgid "WARNING: invalid notation data found\n"
+msgstr "ĵ�i�G���L�Ī��аO���\n"
+
+#: g10/keylist.c:286
+msgid "Critical signature notation: "
+msgstr "����ñ���аO�G "
+
+#: g10/keylist.c:288
+msgid "Signature notation: "
+msgstr "ñ���аO�G "
+
+#: g10/keylist.c:299
+msgid "not human readable"
+msgstr "���O�H����Ū�o����"
+
+#: g10/keylist.c:400
+msgid "Keyring"
+msgstr "�_�Ͱ�"
+
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [���Ĵ����G %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
+#, c-format
+msgid " [expires: %s]"
+msgstr " [���Ĵ����G %s]"
+
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[�w�M�P]"
+
+#: g10/keylist.c:1357
+msgid "Primary key fingerprint:"
+msgstr "�D�_�����G"
+
+#: g10/keylist.c:1359
+msgid "     Subkey fingerprint:"
+msgstr "              �l�_�����G"
+
+#: g10/keylist.c:1366
+msgid " Primary key fingerprint:"
+msgstr " �D�_�����G"
+
+#: g10/keylist.c:1368
+msgid "      Subkey fingerprint:"
+msgstr "               �l�_�����G"
+
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid "      Key fingerprint ="
+msgstr "            ���_���� ="
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "�[�K�L�����q���_ (%d) �ؤo�޲�\n"
+
+#: g10/mainproc.c:262
+#, fuzzy, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "�������s�K�t��k"
+
+#: g10/mainproc.c:299
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "�[�K�L�����q���_ (%d) �ؤo�޲�\n"
+
+#: g10/mainproc.c:301 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s �[�K�L�����\n"
+
+#: g10/mainproc.c:305 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "�H�������t��k %d �[�K�L\n"
+
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "�H�������t��k %d �[�K�L\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
+msgstr "���_�O %08lX\n"
+
+#: g10/mainproc.c:428
+msgid "public key encrypted data: good DEK\n"
+msgstr "���_�[�K�L����ơG���n�� DEK\n"
+
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "�H %u �줸 %s ID %08lX �إߩ� %s �����_�[�K�L\n"
+
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "�H %s ID %08lX �����_�[�K�L\n"
+
+#: g10/mainproc.c:486
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "���_�ѱK���ѡG %s\n"
+
+#: g10/mainproc.c:500
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "�ЦA��J�@���K�X��\n"
+
+#: g10/mainproc.c:502
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "�ЦA��J�@���K�X��\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "���w %s ���[�K�L�����\n"
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "IDEA �s�K�k���i�ΡA�ڭ̼��[�a�յۧ�H %s �N��\n"
+
+#: g10/mainproc.c:570
+msgid "decryption okay\n"
+msgstr "�ѱK���\\n"
+
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "ĵ�i�G�T�������짹�㪺�O�@\n"
+
+#: g10/mainproc.c:587
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "ĵ�i�G�[�K�L���T���w�g�Q�ܳy�F�I\n"
+
+#: g10/mainproc.c:593
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "�ѱK���ѡG %s\n"
+
+#: g10/mainproc.c:613
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "�Ъ`�N�G�H��̭n�D�F�u�p���Ӭ�β����ݡv\n"
+
+#: g10/mainproc.c:615
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "��l���ɦW ='%.*s'\n"
+
+#: g10/mainproc.c:787
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "�W�ߺM�P �w �Х� \"gpg --import\" �ӮM��\n"
+
+#: g10/mainproc.c:1283
+msgid "signature verification suppressed\n"
+msgstr "ñ�����Ҥw�Q����\n"
+
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
+msgid "can't handle these multiple signatures\n"
+msgstr "�L�k�B�z�o�Ǧh��ñ��\n"
+
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid "               using %s key %s\n"
+msgstr "                ��Y \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr "�� %.*s �إߪ�ñ���A�ϥ� %s ���_ ID %08lX\n"
+
+#: g10/mainproc.c:1370
+#, fuzzy
+msgid "Key available at: "
+msgstr "�S���i������"
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
+msgid "BAD signature from \""
+msgstr "*�l�a* ��ñ���Ӧ۩� \""
+
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
+msgid "Expired signature from \""
+msgstr "�L����ñ���Ӧ۩� \""
+
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
+msgid "Good signature from \""
+msgstr "���n��ñ���Ӧ۩� \""
+
+#: g10/mainproc.c:1510
+msgid "[uncertain]"
+msgstr "[���T�w]"
+
+#: g10/mainproc.c:1543
+msgid "                aka \""
+msgstr "                ��Y \""
+
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "�o��ñ�p�b %s �L���C\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s �A�K�n�t��k %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "�G�i��"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "��r�Ҧ�"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "����"
+
+#: g10/mainproc.c:1668
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "�L�k�ˬdñ���G %s\n"
+
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
+msgid "not a detached signature\n"
+msgstr "���O�@��������ñ��\n"
+
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "ĵ�i�G������h��ñ���C�馳�Ĥ@��ñ���׷|�Q�ֿ�C\n"
+
+#: g10/mainproc.c:1787
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "���� 0x%02x ���W��ñ��\n"
+
+#: g10/mainproc.c:1844
+msgid "old style (PGP 2.x) signature\n"
+msgstr "�«� (PGP 2.x) ñ��\n"
+
+#: g10/mainproc.c:1854
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "�b proc_tree() ��������L�Ī� root �ʥ]\n"
+
+#: g10/misc.c:82
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "�L�k���t�ΰ���ɦL�֤��ɡG %s\n"
+
+#: g10/misc.c:146
+msgid "Experimental algorithms should not be used!\n"
+msgstr "���Өϥι���ʪ��t��k�I\n"
+
+#: g10/misc.c:176
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr "����ij�ϥγo�ӽs�K�t��k�F�д��Χ󥿦����I\n"
+
+#: g10/misc.c:282
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "IDEA �s�K�k�~���Ҳդ��s�b\n"
+
+#: g10/misc.c:283
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr "�аѦ� http://www.gnupg.org/why-not-idea.html ���o��h��T\n"
+
+#: g10/misc.c:491
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: ����ij�ϥΪ��ﶵ \"%s\"\n"
+
+#: g10/misc.c:495
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ĵ�i�G \"%s\" �ﶵ�w����ij�ϥ�\n"
+
+#: g10/misc.c:497
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "��H \"%s%s\" �N��\n"
+
+#: g10/misc.c:508
+#, fuzzy
+msgid "Uncompressed"
+msgstr "���Q�B�z"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "���Q�B�z"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "�q `%s' Ū���ﶵ\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "�������w�]����� `%s'\n"
+
+#: g10/parse-packet.c:120
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "�L�k�ާ@���}���_�t��k %d\n"
+
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1128
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "%d ���O���l�ʥ]�]�w�F����줸\n"
+
+#: g10/passphrase.c:461 g10/passphrase.c:508
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent �b�����q�L�k�ϥ�\n"
+
+#: g10/passphrase.c:469
+msgid "can't set client pid for the agent\n"
+msgstr "�L�k�]�w�N�z�{�������ϥΪ̺� pid\n"
+
+#: g10/passphrase.c:477
+msgid "can't get server read FD for the agent\n"
+msgstr "�L�k���o�N�z�{���һݪ����A��Ū���ɮ״y�z\n"
+
+#: g10/passphrase.c:484
+msgid "can't get server write FD for the agent\n"
+msgstr "�L�k���o�N�z�{���һݪ����A���g�J�ɮ״y�z\n"
+
+#: g10/passphrase.c:517
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "�Q�ܳy�� GPG_AGENT_INFO �����ܼ�\n"
+
+#: g10/passphrase.c:530
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent ��w���� %d ���Q�䴩\n"
+
+#: g10/passphrase.c:551
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "�L�k�s���� `%s' �G %s\n"
+
+#: g10/passphrase.c:573
+msgid "communication problem with gpg-agent\n"
+msgstr "gpg-agent ���q�T���D\n"
+
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
+msgid "problem with the agent - disabling agent use\n"
+msgstr "�N�z�{�������D �w ���b���ΥN�z�{��\n"
+
+#: g10/passphrase.c:681
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (�D�n���_ ID %08lX)"
+
+#: g10/passphrase.c:691
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"�p�ݭn�U�C�ϥΪ̪��K�X��ӸѶ}�p�_�G\n"
+"\"%.*s\"\n"
+"%u �줸 %s ID %08lX �����_�A�إߩ� %s%s\n"
+
+#: g10/passphrase.c:713
+msgid "Repeat passphrase\n"
+msgstr "�ЦA��J�@���K�X��\n"
+
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "�п�J�K�X��\n"
+
+#: g10/passphrase.c:753
+msgid "passphrase too long\n"
+msgstr "�K�X��Ӫ�\n"
+
+#: g10/passphrase.c:766
+msgid "invalid response from agent\n"
+msgstr "�N�z�{���Ǧ^�L�Ī��^��\n"
+
+#: g10/passphrase.c:781 g10/passphrase.c:874
+msgid "cancelled by user\n"
+msgstr "�ѨϥΪ̨����F\n"
+
+#: g10/passphrase.c:786 g10/passphrase.c:963
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "�N�z�{�������D�G�N�z�{���Ǧ^ 0x%lx\n"
+
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "�b�妸�Ҧ����L�k�߰ݱK�X\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "�п�J�K�X��G "
+
+#: g10/passphrase.c:1131
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"�p�ݭn�U�C�ϥΪ̪��K�X��A�ׯ�Ѷ}�p�_�G\n"
+"\""
+
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u �줸 %s ID %08lX �����_�A�إߩ� %s"
+
+#: g10/passphrase.c:1149
+#, c-format
+msgid "         (subkey on main key ID %s)"
+msgstr ""
+
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (�D�n���_ ID %08lX)"
+
+#: g10/passphrase.c:1213
+msgid "Repeat passphrase: "
+msgstr "�ЦA��J�@���K�X��G "
+
+#: g10/plaintext.c:90
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "��ƥ��Q�x�s�F�Х� \"--output\" �ﶵ���x�s����\n"
+
+#: g10/plaintext.c:132 g10/plaintext.c:150
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "�إ� `%s' �ɵo�Ϳ��~�G %s\n"
+
+#: g10/plaintext.c:438
+msgid "Detached signature.\n"
+msgstr "�������C\n"
+
+#: g10/plaintext.c:442
+msgid "Please enter name of data file: "
+msgstr "�п�J����ɪ��W�١G "
+
+#: g10/plaintext.c:463
+msgid "reading stdin ...\n"
+msgstr "���b�q�зǿ�JŪ�� ...\n"
+
+#: g10/plaintext.c:497
+msgid "no signed data\n"
+msgstr "�S���Qñ�p�L�����\n"
+
+#: g10/plaintext.c:505
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "�L�k�}�ҳQñ�p�L����� `%s'\n"
+
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "�ΦW����̡F���b���ըϥΨp�_ %08lX ...\n"
+
+#: g10/pubkey-enc.c:119
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "�ܦn�A�ڭ̴N�O�ΦW����̡C\n"
+
+#: g10/pubkey-enc.c:207
+msgid "old encoding of the DEK is not supported\n"
+msgstr "���䴩�¦��� DEK �s�X\n"
+
+#: g10/pubkey-enc.c:228
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "�s�K�t��k %d%s �����Τw���ΤF\n"
+
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "�Ъ`�N�G���n�]�w���䤣��s�K�t��k %d\n"
+
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "�Ъ`�N�G�p�_ %08lX �b %s �L���F\n"
+
+#: g10/pubkey-enc.c:292
+msgid "NOTE: key has been revoked"
+msgstr "�Ъ`�N�G���_�w�g�Q�M�P�F"
+
+#: g10/seckey-cert.c:54
+msgid "secret key parts are not available\n"
+msgstr "�p�_�����L�k����\n"
+
+#: g10/seckey-cert.c:60
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "�O�@�t��k %d%s ���Q�䴩\n"
+
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "�O�@�t��k %d%s ���Q�䴩\n"
+
+#: g10/seckey-cert.c:250
+msgid "Invalid passphrase; please try again"
+msgstr "�L�Ī��K�X��F�ЦA�դ@��"
+
+#: g10/seckey-cert.c:251
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:311
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "ĵ�i�G��������_���z �w �ЦA�󴫱K�X��@���C\n"
+
+#: g10/seckey-cert.c:349
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr "���b���ͨp�_�O�@�|�Ψ쪺�¦� 16 �줸�[�`�ˬd\n"
+
+#: g10/sig-check.c:75
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "ĵ�i�Gñ���K�n�P�T�����@�P\n"
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr ""
+
+#: g10/sig-check.c:102
+#, fuzzy, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
+
+#: g10/sig-check.c:168
+#, fuzzy, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "���_ %08lX ��ñ���٭n�s�F %lu ��\n"
+
+#: g10/sig-check.c:169
+#, fuzzy, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "���_ %08lX ��ñ���٭n�s�F %lu ��\n"
+
+#: g10/sig-check.c:180
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
+
+#: g10/sig-check.c:182
+#, fuzzy, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
+
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "�Ъ`�N�Gñ�����_ %08lX �w�� %s �L��\n"
+
+#: g10/sig-check.c:275
+#, fuzzy, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "���]���_ %08lX ���l�añ���ɦ]��Y�ӥ���������줸\n"
+
+#: g10/sig-check.c:532
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "���_ %08lX: �S���l�_�M�P�ʥ]�һݪ��l�_\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^��ñ������J�аO���\n"
+
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^�����_ñ������J�аO���\n"
+
+#: g10/sign.c:112
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr "ĵ�i�G�аO %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^������J��h URL\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^�����_����J��h URL\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgstr "ĵ�i�G��h URL �� %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
+msgstr "ĵ�i�G��h URL �� %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
+
+#: g10/sign.c:364
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "�ˬd�w�إߪ�ñ���ɵo�Ϳ��~�G %s\n"
+
+#: g10/sign.c:373
+#, fuzzy, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s ñ���ӦۡG \"%s\"\n"
+
+#: g10/sign.c:550
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ĵ�i�G `%s' �O�@�Ӫ��ɮ�\n"
+
+#: g10/sign.c:741
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
+
+#: g10/sign.c:765 g10/sign.c:1001
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "�L�k�إ� %s: %s\n"
+
+#: g10/sign.c:794
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "�j���ϥ� %s (%d) �K�n�t��k�|�H�Ϧ���̰��n�]�w\n"
+
+#: g10/sign.c:886
+msgid "signing:"
+msgstr "ñ�p�G"
+
+#: g10/sign.c:985
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
+
+#: g10/sign.c:1138
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s �[�K�N�Q�ĥ�\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "�L�k�B�z���� %d �r�Ū���r�C\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "��J�C�� %d �r���٪�\n"
+
+#: g10/tdbio.c:128 g10/tdbio.c:1434
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "�H����Ʈw�O�� %lu: ���a�j�M���ѡG %s\n"
+
+#: g10/tdbio.c:134 g10/tdbio.c:1441
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "�H����Ʈw�O�� %lu: �g�J���� (n=%d): %s\n"
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr "�H����Ʈw��ʶq�L�j\n"
+
+#: g10/tdbio.c:497
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: �L�k�s���G %s\n"
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: �ؿ����s�b�I\n"
+
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: �L�k�إ���w\n"
+
+#: g10/tdbio.c:524 g10/tdbio.c:586
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: �L�k��w\n"
+
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: �L�k�إߡG %s\n"
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: �إߪ����O�����ѡG %s"
+
+#: g10/tdbio.c:549
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: �إߤF�L�Ī��H����Ʈw\n"
+
+#: g10/tdbio.c:552
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: �إߤF�H����Ʈw\n"
+
+#: g10/tdbio.c:592
+msgid "NOTE: trustdb not writable\n"
+msgstr "�Ъ`�N�G�H����Ʈw���i�g�J\n"
+
+#: g10/tdbio.c:608
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: �L�Ī��H����Ʈw\n"
+
+#: g10/tdbio.c:640
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: �إ���������ѡG %s\n"
+
+#: g10/tdbio.c:648
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: ��s�����O���ɿ��~�G %s\n"
+
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: Ū�������O���ɿ��~�G %s\n"
+
+#: g10/tdbio.c:724
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: �g�J�����O���ɿ��~�G %s\n"
+
+#: g10/tdbio.c:1163
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "�H����Ʈw�G���a�j�M���ѡG %s\n"
+
+#: g10/tdbio.c:1171
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "�H����Ʈw�GŪ������ (n=%d): %s\n"
+
+#: g10/tdbio.c:1192
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: ���O�@�ӫH����Ʈw�ɮ�\n"
+
+#: g10/tdbio.c:1210
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: �O���s���� %lu �������O��\n"
+
+#: g10/tdbio.c:1215
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: �L�Ī��ɮת��� %d\n"
+
+#: g10/tdbio.c:1400
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: Ū���ۥѰO���ɿ��~�G %s\n"
+
+#: g10/tdbio.c:1408
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: �g�J�ؿ��O���ɿ��~�G %s\n"
+
+#: g10/tdbio.c:1418
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: �O���k�s�ɥ��ѡG %s\n"
+
+#: g10/tdbio.c:1448
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: ���[�Y���O���ɥ��ѡG %s\n"
+
+#: g10/tdbio.c:1493
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "�H����Ʈw�l���F�F�а��� \"gpg --fix-trustdb\" �C\n"
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "`%s' ���O�@�Ӧ��Ī��������_ ID\n"
+
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "���_ %08lX: �p���H�������_��Q�����F\n"
+
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "���_ %08lX �b�H����Ʈw���X�{�F����@��\n"
+
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "���_ %08lX: ���H�������_�S�����_ �w �w���L\n"
+
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "���_�w�Q�аO�������H���F�C\n"
+
+#: g10/trustdb.c:344
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "�H���O�� %lu �A�ШD���O %d: Ū�����ѡG %s\n"
+
+#: g10/trustdb.c:350
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "�H���O�� %lu ���O�ҽШD�����O %d\n"
+
+#: g10/trustdb.c:365 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "�H���O�� %lu �A���O %d: �g�J���ѡG %s\n"
+
+#: g10/trustdb.c:380 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "�H����Ʈw�G�P�B�ƥ��ѡG %s\n"
+
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "�û����L��"
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
+msgid "no need for a trustdb check\n"
+msgstr "���ݭn�ˬd�H����Ʈw\n"
+
+#: g10/trustdb.c:550 g10/trustdb.c:2103
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "�U���H����Ʈw�ˬd�N�� %s �i��\n"
+
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "���ݭn�ˬd�H����Ʈw\n"
+
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "���ݭn�ˬd�H����Ʈw\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "���_ %08lX �S���Q���G %s\n"
+
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "��@�� --check-trustdb\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "���b�ˬd�H����Ʈw\n"
+
+#: g10/trustdb.c:1847
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "�w�g�B�z�F %d ����_�]�@�p�w�ѨM�F %d �����ĩʡ^\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "�S������������H�������_\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "�����H�����_ %08lX �����_�S���Q���\n"
+
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
+#, c-format
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "�H���O�� %lu �A���O %d: �g�J���ѡG %s\n"
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"ñ���L�k�Q���ҡC\n"
+"�аO��ñ���� (.sig �� .asc)\n"
+"���ӬO�Ĥ@�өR�O�C���w���ɮסC\n"
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "��J�C %u �Ӫ��Ϊ̦C���� LF �򥢤F\n"
+
+#: 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 "���_���Q�Хܬ����w�� �w ��������Ӹ򰲪��H���Ʀr���;��֥ΡI\n"
+
+#: g10/skclist.c:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' �w���L�G���ƤF\n"
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "`%s' �w���L�G %s\n"
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr "�w���L�G�p�_�w�g�s�b\n"
+
+#: g10/skclist.c:179
+#, fuzzy, c-format
+msgid ""
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
+"signatures!\n"
+msgstr "`%s' �w���L�G�o�O�@��� PGP ���ͪ� ElGamal ���_�A�Ω�ñ���ä��w���I\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "�ɮ� `%s' �s�b�C "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "�O�_�мg (y/N)�H "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: ���������ɦW\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "�п�J�s���ɦW"
+
+#: g10/openfile.c:183
+msgid "writing to stdout\n"
+msgstr "���b�g�J��зǿ�X\n"
+
+#: g10/openfile.c:282
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "���]�Qñ�p����Ʀb `%s'\n"
+
+#: g10/openfile.c:349
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "�s���]�w�� `%s' �Q�إߤF\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "ĵ�i�G�b `%s' �̪��ﶵ��o����������èS���Q�ҥ�\n"
+
+#: g10/openfile.c:380
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: �L�k�إߥؿ��G %s\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: �ؿ��إߧ���\n"
+
+#: g10/encr-data.c:91
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "ĵ�i�G�T���Q�H��٦��s�K�k���z���_�[�K�F�C\n"
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr "�B�z�[�K���ʥ]�����D\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "�إߤF�z���_ �w ���b����\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "�L�k�קK��٦��s�K�k���z���_�F�w�g�դF %d ���F�I\n"
+
+#: g10/seskey.c:210
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA �n�D�ϥ� 160 �줸������t��k\n"
+
+#: g10/delkey.c:121 g10/delkey.c:128
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(���D�p�������w�F���_)\n"
+
+#: g10/delkey.c:127
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "�b�妸�Ҧ����A�S�� \"--yes\" �N�S��k�o��\n"
+
+#: g10/delkey.c:139
+msgid "Delete this key from the keyring? "
+msgstr "�n�q�_�Ͱ�̧R���o����_�ܡH "
+
+#: g10/delkey.c:147
+msgid "This is a secret key! - really delete? "
+msgstr "�o�O�@��p�_�I �w �u���n�R���ܡH "
+
+#: g10/delkey.c:157
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
+
+#: g10/delkey.c:167
+msgid "ownertrust information cleared\n"
+msgstr "�D�[�H����T�w�g�Q�M��\n"
+
+#: g10/delkey.c:195
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "���_ \"%s\" ���۹������p�_�I\n"
+
+#: g10/delkey.c:197
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "�Х��H \"--delete-secret-keys\" �ﶵ�ӧR�����C\n"
+
+#: g10/helptext.c:48
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"�b�o�̫������ƭȧ����O�ݩp�ۤv�M�w�F�o�Ǽƭȥû����|�Q�ץX����L�H�C\n"
+"�ڭ̻ݭn���ӹ�I�H�������F�o��]�۰ʫإ߰_���^���Һ����@�I���Y�]�S���C"
+
+#: g10/helptext.c:54
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"�n�إ߰_�H�������AGnuPG �ݭn���D���Ǫ��_�O�Q�����H���� �w \n"
+"���Ǫ��_�q�`�N�O�p����k�s����p�_���C�^�� \"yes\" �ӱN�o��\n"
+"���_�]���Q�����H����\n"
+
+#: g10/helptext.c:61
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr "�p�G�p�L�צp��Q�n�ϥγo��Q�M�P�F�����_�A�Ц^�� \"yes\" �C"
+
+#: g10/helptext.c:65
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr "�p�G�p�L�צp��Q�n�ϥγo�⥼�Q�H�������_�A�Ц^�� \"yes\"�C"
+
+#: g10/helptext.c:69
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr "��J�p�n���e���T�������̪��ϥΪ� ID�C"
+
+#: g10/helptext.c:73
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+
+#: g10/helptext.c:87
+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 ""
+"�q�`�ӻ��ΦP�@����_ñ�p�Υ[�K�ä��O�Ӧn�D�N�C\n"
+"�o�Ӻt��k���Ӭ�Q�Ω�S�w�����p�U�C\n"
+"���p���p���w���M�a�C"
+
+#: g10/helptext.c:94
+msgid "Enter the size of the key"
+msgstr "�п�J���_���ؤo"
+
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
+msgid "Answer \"yes\" or \"no\""
+msgstr "�Ц^�� \"yes\" �� \"no\""
+
+#: g10/helptext.c:108
+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"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"�п�J���ܸ̩ҭn�D���ƭȡC\n"
+"�p�i�H��J ISO ����榡 (YYYY-MM-DD)�A���O���|�o��}�n�����~�^���w\n"
+"�Ϥ��A�t�η|�յۧ⵹�w���ƭȤ��_���Y�z���q�C"
+
+#: g10/helptext.c:120
+msgid "Enter the name of the key holder"
+msgstr "�п�J���_�����H���W�r"
+
+#: g10/helptext.c:125
+msgid "please enter an optional but highly suggested email address"
+msgstr "�п�J��Ρ]���j�P��ij�ϥΡ^���q�l�l���}"
+
+#: g10/helptext.c:129
+msgid "Please enter an optional comment"
+msgstr "�п�J��Ϊ�����"
+
+#: g10/helptext.c:134
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N  �ק�m�W�C\n"
+"C  �ק�����C\n"
+"E  �ק�q�l�l���}�C\n"
+"O  �~�򲣥ͪ��_�C\n"
+"Q  ����ͪ��_�C"
+
+#: g10/helptext.c:143
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "�p�G�pı�o���ͤl�_�i�H���ܡA�N�^�� \"yes\" (�Ϊ̬�n \"y\") �C"
+
+#: g10/helptext.c:151
+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"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful "
+"for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this "
+"could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with "
+"a\n"
+"    photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+"    name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"���p�b�Y����_�Wñ�p�Y�ӨϥΪ� ID �A�p�������������Ҩ���\n"
+"���_�T���ݩ󨺭ӨϥΪ� ID �W�s���ӦW�r���H�C�o�墨�Ǫ��D\n"
+"�p�h�p�����Ҫ��H�ӻ��ܦ��ΡC\n"
+"\n"
+"\"0\" ���ܩp���ണ�X����S�O���D�i�Ӫ���\n"
+"    �p�h�J�����Ҩ�����_\n"
+"\n"
+"\"1\" ���ܩp�۫H�o����_�ݩ󨺭ӥD�i�O�D�H���H�A\n"
+"    ���O�p����ΨS�����Ҩ�����_�C\n"
+"    �o�墨�Ǭ�Q�n�u�ӤH���v���Ҫ��H�ӻ��ܦ��ΡA\n"
+"    �]���pñ�p�F�@�������ΦW�ϥΪ̪����_�C\n"
+"\n"
+"\"2\" ���ܩp�u���J�����ҤF������_�C\n"
+"    �Ҧp���A�o����ܩp���ҤF�o����_�������M\n"
+"    �ϥΪ� ID �A�ä��F�Ӥ� ID �C\n"
+"\n"
+"\"3\" ���ܩp�u�����F�j�W�Ҫ����Ҫ��_�u�@�C\n"
+"    �Ҧp���A�o����ܩp�V���_�����H���ҤF���_�����A\n"
+"    �ӥB�p�z�L���a�Ӥ������H���y����� (���O�@��) \n"
+"    �T�{�F���_�����H���m�W�P���_�W�ϥΪ� ID ���@�P�A\n"
+"    �̫�p�� (�z�L�q�l�l�󩹨�) ���ҤF���_�W��\n"
+"    �q�l�l���}�T���ݩ���_�����H�C\n"
+"\n"
+"�Ъ`�N�W�z���󵥯� 2 �M 3 ���Ҥl�u��O�v�Ҥl�Ӥw�C\n"
+"�̫�A�٬O�o�ѩp�ۤv�M�w���pñ�p��L���_�ɡA\n"
+"�ƻ�O�u�����g�ߡv�A�Ӭƻ�O�u�W���ԷV�v�C\n"
+"\n"
+"�p�G�p�����D���ӿ�ƻ򵪮ת��ܡA�N�� \"0\" �C"
+
+#: g10/helptext.c:189
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "�p�G�p�Q�nñ�p *�Ҧ�* �ϥΪ� ID ���ܴN�� \"yes\""
+
+#: g10/helptext.c:193
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"�p�G�p�u���Q�n�R���o�ӨϥΪ� ID ���ܴN�^�� \"yes\" �C\n"
+"�Ҧ������Ҧb������]���|���h�I"
+
+#: g10/helptext.c:198
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "�p�G�R���o��l�_�S���D���ܴN�^�� \"yes\""
+
+#: g10/helptext.c:203
+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 ""
+"�o�O�@���b�o����_�W���Ī�ñ���F�q�`�p���|�Q�n�R���o��ñ���A\n"
+"�]���n��O�����_�إ߰_�H���s���A�Υѳo����_��ñ�p�����_����\n"
+"�|�O�@��۷����n���ơC"
+
+#: g10/helptext.c:208
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"�o��ñ���L�k�Q����A�]���p�S���ŦX�����_�C�p���ө��w�R�����A\n"
+"����p���D���@����_�Q�ϥΤF�F�]���o���ñ�p�����_�i��z�L\n"
+"��L�w�g���Ҫ����_�إߤF�@�ӫH���s���C"
+
+#: g10/helptext.c:214
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr "�o��ñ���S���ġC�⥦�q�p���_�Ͱ�̲��h�۷��X�z�C"
+
+#: g10/helptext.c:218
+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"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"�o�O�@���M�o�Ӫ��_�ϥΪ� ID ��ô��ñ���C�q�`\n"
+"��o�˪�ñ���������|�O�Ӧn�I�l�C�ƹ�W GnuPG \n"
+"�i��q���N����A�ϥγo����_�F�C�ҥH�馳�b�o\n"
+"����_���Ĥ@�Ӧۧ�ñ���]�Y�ǭ�]�L�ġA�ӲĤG\n"
+"���٥i�Ϊ����p�U�׳o�򰵡C"
+
+#: g10/helptext.c:226
+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 ""
+"�ܧ�Ҧ��]�ά馳�Q��������X�ӡ^�ϥΪ� ID �����n���{�Ϊ����n�M��C\n"
+"�Ҧ�����v�T���ۧ�ñ�����ɶ��W�O���|�W�[�@�����C\n"
+
+#: g10/helptext.c:233
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr "�п�J�K�X��F�o�O�@�ӯ��K���y�l \n"
+
+#: g10/helptext.c:239
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "�ЦA����J�̫᪺�K�X��A�H�T�w�p�쩳��i�F�Ǭƻ�C"
+
+#: g10/helptext.c:243
+msgid "Give the name of the file to which the signature applies"
+msgstr "�е��wñ���ҭn�M�Ϊ��ɮצW��"
+
+#: g10/helptext.c:248
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "�p�G�мg�o���ɮרS�����D���ܴN�^�� \"yes\""
+
+#: g10/helptext.c:253
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"�п�J�@�ӷs���ɦW�C�p�G�p�������U�F Enter �A����\n"
+"�N�|�ϥιw�]���ɮ� (��ܦb�A����) �C"
+
+#: g10/helptext.c:259
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"�p���Ӭ��o�����ҫ��w�@�ӭ�]�C\n"
+"�ھڱ��Ҫ����P�A�p���ӥi�H�q�o�ӲM�椤��X�@���G\n"
+"  \"���_�w�g�Q���|�F\"\n"
+"      �p�G�p�۫H���Y�ӥ��g�\�i���å���o�F�p���p�_���ܡA\n"
+"      �N��o�ӡC\n"
+"  \"���_�Q�N���F\"\n"
+"      �p�G�p��p�����_�����s���F�A�N��o�ӡC\n"
+"  \"���_���A�Q�ϥΤF\"\n"
+"      �p�G�p�w�g�M�^�F�o����_�A�N��o��\n"
+"  \"�ϥΪ� ID ���A���ĤF\"\n"
+"      �p�G�o�ӨϥΪ� ID ���A�Q�ϥΤF�A�N��o�ӡF\n"
+"      �o�q�`�ΨӪ��ܬY�ӹq�l�l���}���A���ĤF�C\n"
+
+#: g10/helptext.c:275
+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 ""
+"�p�]�i�H��J�@���r�Ӵy�z���ƻ�o�G�o���M�P���Ҫ��z�ѡC\n"
+"�����o�q��r�O��²����n�C\n"
+"��J�ťզC�H�����o�q��r�C\n"
+
+#: g10/helptext.c:290
+msgid "No help available"
+msgstr "�S���i������"
+
+#: g10/helptext.c:298
+#, c-format
+msgid "No help available for `%s'"
+msgstr "`%s' �S���i������"
+
+#: g10/keydb.c:189
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "�إ��_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
+
+#: g10/keydb.c:196
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "�_�Ͱ� `%s' �w�إ�\n"
+
+#: g10/keydb.c:615
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "���s�إ��_�Ͱ�֨����ѡG %s\n"
+
+#: g10/keyring.c:1236
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "ĵ�i�G2 ���ɮצs�b�����ۥ٬ު���T�C\n"
+
+#: g10/keyring.c:1238
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s �O�S�����ܪ����@��\n"
+
+#: g10/keyring.c:1239
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s �O�s�����@��\n"
+
+#: g10/keyring.c:1240
+msgid "Please fix this possible security flaw\n"
+msgstr "�Э׸ɳo�ӥi�઺�w���ʵ��_\n"
+
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "���b�ˬd�_�Ͱ� `%s'\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: �_�Ͱ�w�إ�\n"
+
+#: g10/photoid.c:65
+#, c-format
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"�ЬD��@�i�Ϥ��ӷ����p���Ӥ� ID �C�o�i�Ϥ��@�w�n�O JPEG �����צ�C\n"
+"�аO���o�i�Ϥ��|�Q�s��b�p�����_�̡C�p�G�p�D�F�D�`�j���Ϥ����ܡA\n"
+"�p�����_�]�|�ܦ��D�`�a�j�I\n"
+"�ɶq��Ϥ��ؤo����b 240x288 ���k�A�|�O�ӫD�`�z�Q���j�p�C\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "��J�n���@�ۤ� ID �� JPEG �ɦW�G "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "�L�k�}�ҷӤ� \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "�p�T�w�n�Υ��ܡH (y/N) "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" ���O�@�� JPEG ����\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "�o�i�Ӥ����T�ܡH (y/N/q) "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "�L�k��ܷӤ� ID �I\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "�S���w�䴩�����ݵ{������\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "�L�k�إߥؿ� `%s': %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr "�]�����w�����ɮ��v���ﶵ�A�ӸT�ΤF�~���{���s��\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr "�b�o�ӧ@�~���x�W�s�Υ~���{���ɻݭn�Ȧs��\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "�L�k���� %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "�s�Υ~���{���ɵo�ͨt�ο��~�G %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "�~���{�����۵M�a���}\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "�L�k����~���{��\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "�L�kŪ���~���{���^���G %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "ĵ�i�G�L�k�����Ȧs�� (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "ĵ�i�G�L�k�����Ȧs�ؿ� `%s': %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never     "
+msgstr "�û����L��"
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet ���ѡG %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "���_ %08lX: �S���ϥΪ� ID\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "�N�Q�M�P�G\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "�]�o�O����K���M�P���_�^\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "�n���o����_�إߤ@���M�P���ҶܡH "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "�w�j���ϥ� ASCII �ʸ˹L����X�C\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet ���ѡG %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "�w�إߺM�P���ҡC\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "�S����� `%s' ���M�P���_\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "�䤣�� `%s' �p�_�G %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "�S���۹��������_�G %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "���_�P�p�_��k�X�I\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "�������O�@�t��k\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "�`�N�G�o����_�S���Q�O�@�I\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"�w�إߺM�P���ҡC\n"
+"\n"
+"�Ч�o���ɮ׷h����t�@�өp����N���ð_�Ӫ��C���W�F\n"
+"�p�G���H������o�o�����Ҫ��ܡA����L�]������p��\n"
+"���_�L�k�~��ϥΡC��o�����ҦC�L�X�ӦA�è�O���a\n"
+"��]�O�ܦn����k�A�H�K�p���x�s�C���l���ӵL�kŪ���C\n"
+"���O�d�U�p�ߡG�p�������W���C�L�t�Υi��|�b�C�L�L\n"
+"�{����o�Ǹ�ƼȦs�b�Y�Ө�L�H�]����ݱo�쪺�a��I\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "�п�ܺM�P����]�G\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "����"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "�]�]�\�p�|�Q�n�b�o�̿�� %d �^\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "�п�J��Ϊ��y�z�F�H�ťզC�����G\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "�M�P��]�G %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "�]�S�����w�y�z�^\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "�o�˥i�H�ܡH "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# �۹������H���ȲM��Q�إߩ� %s\n"
+"# �]�Х� \"gpg --import-ownertrust\" �Ө��^���̡^\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "�L�k�}���ɮסG %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "�C�Ӫ�\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "���~�G�_���ʺ|\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "���~�G�L�Ī�����\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "���~�G�S���D�[�H����\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "�M��H���O���ɿ��~�G %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "Ū�����~�G %s\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[�ɮ�]|�[�K�ɮ�"
+
+#~ msgid "store only"
+#~ msgstr "���x�s"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[�ɮ�]|�ɮ׸ѱK"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "�H���i�M�P�Ҧ���ñ�p�Y����_"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "�Ȧb���a�H���i�M�P�Ҧ���ñ�p�Y����_"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "�ȦC�X�ʥ]�ǦC"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "�ץX�D�[�H����"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "�פJ�D�[�H����"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "��s�����[���H����Ʈw"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "�״_�Y�Ӥw�l�����H����Ʈw"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr "�q�ɮשμзǿ�J�Ѷ}�ʸ�"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "�q�ɮשμзǿ�J�i��ʸ�"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr "|�W�r|�H�u�W�r�v�אּ�w�]�������"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "��w�]�����_���@�w�]�������"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "�������n�ϥβ׺�"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "�j���ϥβĤT��ñ��"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "���n�j���ϥβĤT��ñ��"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "�j���ϥβĥ|�����_ñ��"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "���n�j���ϥβĥ|�����_ñ��"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "�`�O�� MDC �ӥ[�K"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "�û����n�� MDC �ӥ[�K"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "�ϥ� gpg-agent �N�z�{��"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "�妸�Ҧ��G�û����߰�"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr "���]�j�h�ư��D���^�����u�O�v"
+
+#~ msgid "assume no on most questions"
+#~ msgstr "���]�j�h�ư��D���^�����u�_�v"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "��o���_�Ͱ�[�i�_�Ͱ�M�椤"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "��o�Өp�_�_�Ͱ�[�i�M�椤"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "��ܳQ�C�X�����_�b���@���_�Ͱ�W"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr "|�W�r|�ϥΡu�W�r�v���@�w�]�p�_"
+
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|�D��|�ϥγo�Ӫ��_���A���ӴM����_"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|�W��|�]�w�׺ݦr�������u�W�١v"
+
+#~ msgid "read options from file"
+#~ msgstr "�q�ɮ�Ū���ﶵ"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr "|[�ɮ�]|�⪬�A��T�g�J�ɮ�"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|���_ID|�����H�������_"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr "|�ɮ�|���J�����Ҳ��ɮ�"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr "�ɶq�ҥ� RFC1991 �̩Ҵy�z���Ҧ�"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 OpenPGP ���A"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 PGP 2.x ���A"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|�ϥμҦ� N ���K�X��"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr "|�W��|�K�X��ϥΡu�W�١v�T���K�n�t��k"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr "|�W��|�K�X��ϥΡu�W�١v�s�K�t��k"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr "|�W��|�ϥΡu�W�١v�s�K�t��k"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr "|�W��|�ϥΡu�W�١v�T���K�n�t��k"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "|N|�ϥ� N ���Y�t��k"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr "�q�w�[�K���ʥ]�������_ ID �϶�"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "��ܷӤ� ID"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "����ܷӤ� ID"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr "�]�w�[�ݷӤ� ID �ɭn�Ϊ��R�O�C"
+
+#, fuzzy
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "���Y�t��k�@�w�n���� %d �� %d ����\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: �L�k�T�w�o����_�u���ݩ�o�ӫ�����\n"
+#~ "���O���_���³Q�����F\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "���n�]�w %c%lu �L��\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "���_ %08lX: ���O�@�� rfc2440 ���_ �w �w���L\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr "�`�N�G������ Elgamal �D�_ �w �פJ�o��D�_�i��|�ӤW�@�Ǯɶ�\n"
+
+#~ msgid " (default)"
+#~ msgstr " (�w�])"
+
+#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX  �s�y��G %s �ϥδ����G %s"
+
+#~ msgid "Notation: "
+#~ msgstr "�аO�G "
+
+#~ msgid "Policy: "
+#~ msgstr "��h�G "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "���_ %08lX ���V %s �n�D��\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "�L�k�q���_���A�����o���_�G %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "�ǰe�� `%s' ���ɭԵo�Ϳ��~�G %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "���\�a�ǰe�� `%s' (���A=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "�ǰe�� `%s' ���ɭԥ��ѤF�G���A=%u\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "���b�j�M \"%s\" �� HKP ���A�� %s �W\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "�L�k�j�M���_���A���G %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "���_ %08lX: �o�O�� PGP ���ͪ� ElGamal ���_�A�Ω�ñ���� *��* �w���I\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "���_ %08lX �O�b %lu ���᪺���ӻs�y�X�Ӫ� (�i��O�]���ɥ��Ȧ�ή�������"
+#~ "�D)\n"
+
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr ""
+#~ "���_ %08lX �w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή�������"
+#~ "�D)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "���_ %08lX �Q�аO�������H��\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr "���b�ˬd�`�� %d ñ�p=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures.  This is the suggested algorithm because verification of\n"
+#~ "DSA signatures are much faster than those of ElGamal.\n"
+#~ "\n"
+#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n"
+#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+#~ "only\n"
+#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n"
+#~ "selected in a special way to create a safe key for signatures: this "
+#~ "program\n"
+#~ "does this but other OpenPGP implementations are not required to "
+#~ "understand\n"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "��ܭn�ϥΪ��t��k�C\n"
+#~ "\n"
+#~ "DSA (��Y DSS) �O�@�ج��Ω�ñ�����Ʀ�ñ���t��k�C�o�O��ij�ϥΪ��t��k�A"
+#~ "�]���n���� DSA ñ������ ElGamal ñ���֤W�\�h�C\n"
+#~ "\n"
+#~ "ElGamal �O�@�إi�H�Ω�ñ���M�[�K���t��k�C\n"
+#~ "OpenPGP ��o�غt��k�Ϥ�����ؼ˦��G���[�K���A�M��ñ�p�Υ[�K���F\n"
+#~ "���L�̬O�@�˪��A���O�b���Q�Ω�ñ�����w�����_�e�A�������H�S������k\n"
+#~ "��ܤ@�ǯS�����ѼơG�o�ӵ{���o�ˤl���A����L�� OpenPGP ��@�ä��ݭn\n"
+#~ "�A��ñ���Υ[�K���˦��C\n"
+#~ "\n"
+#~ "�Ĥ@�� (�D�n��) ���_�����n���ñ�p����O�F�o�N�O������\n"
+#~ "�馳 ElGamal ���_�b�o�ӿ��̵L�k�ϥΡC"
+
+#~ msgid ""
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
+#~ msgstr ""
+#~ "���M�o�Ǫ��_�Q�w�q�b RFC2440 �̡A�����M����ij�ĥΥ��̡A\n"
+#~ "�]���L�̨ä��Q�Ҧ����{���Ҥ䴩�A�ӥB�ѥL�̩ҫإ߰_��ñ��\n"
+#~ "�Q���e�j�A���Ұ_�ӧ�O�w�C�C"
+
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
+
+#~ msgid "key incomplete\n"
+#~ msgstr "���_������\n"
+
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "���_ %08lX ������\n"
+
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "quit"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (��ñ�p�Υ[�K)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "�Ъ`�N�A�馳 GnuPG �פ䴩�o�Ӻt��k�C�γo�Ӻt��k�إߪ����_\n"
+#~ "�|�S����k�� PGP �ϥΪ̤��q�C�P�ɳo�Ӻt��k�D�`�a�w�C�A\n"
+#~ "�ӥB�i��]���p��L�t��k�ӱo�w���C\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "�L�צp���٬O�n�إ߶ܡH "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "������L�Ī��D��٩ʪ��_�t��k (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "�o�Ӫ��_���A���ëD�����P HKP �ۮe\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr "�o�Ӻt��k�ä��Q��ij�ϥ� �w �L�צp���٬O�~��ܡH "